From 774b9ae12d43542caeafdfd181fdf4dbe44c21c0 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sat, 19 Dec 2020 00:49:36 -0600
Subject: [PATCH 001/220] Added thumbnail task and database table

---
 .gitignore             |   1 +
 cps.py                 |   4 ++
 cps/constants.py       |   1 +
 cps/helper.py          |   9 ++-
 cps/tasks/thumbnail.py | 154 +++++++++++++++++++++++++++++++++++++++++
 cps/thumbnails.py      |  63 +++++++++++++++++
 cps/ub.py              |  36 +++++++++-
 7 files changed, 264 insertions(+), 4 deletions(-)
 create mode 100644 cps/tasks/thumbnail.py
 create mode 100644 cps/thumbnails.py

diff --git a/.gitignore b/.gitignore
index f06dcd44..cef58094 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ vendor/
 # calibre-web
 *.db
 *.log
+cps/cache
 
 .idea/
 *.bak
diff --git a/cps.py b/cps.py
index 50ab0076..e90a38d9 100755
--- a/cps.py
+++ b/cps.py
@@ -43,6 +43,7 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
+from cps.thumbnails import generate_thumbnails
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -78,6 +79,9 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
+
+    generate_thumbnails()
+
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/constants.py b/cps/constants.py
index c1bcbe59..0a9f9cd5 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -33,6 +33,7 @@ else:
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
+CACHE_DIR           = os.path.join(BASE_DIR, 'cps', 'cache')
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/helper.py b/cps/helper.py
index da5ea2b3..6fc6b02a 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -551,6 +551,11 @@ def get_book_cover_with_uuid(book_uuid,
 
 def get_book_cover_internal(book, use_generic_cover_on_failure):
     if book and book.has_cover:
+        # if thumbnails.cover_thumbnail_exists_for_book(book):
+        #     thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
+        #     return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
+        # else:
+            # WorkerThread.add(None, TaskThumbnail(book, _(u'Generating cover thumbnail for: ' + book.title)))
         if config.config_use_google_drive:
             try:
                 if not gd.is_gdrive_ready():
@@ -561,8 +566,8 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                 else:
                     log.error('%s/cover.jpg not found on Google Drive', book.path)
                     return get_cover_on_failure(use_generic_cover_on_failure)
-            except Exception as e:
-                log.debug_or_exception(e)
+            except Exception as ex:
+                log.debug_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
new file mode 100644
index 00000000..c452ab41
--- /dev/null
+++ b/cps/tasks/thumbnail.py
@@ -0,0 +1,154 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+import os
+
+from cps import config, db, gdriveutils, logger, ub
+from cps.constants import CACHE_DIR as _CACHE_DIR
+from cps.services.worker import CalibreTask
+from datetime import datetime, timedelta
+from sqlalchemy import func
+
+try:
+    from wand.image import Image
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    use_IM = False
+
+THUMBNAIL_RESOLUTION_1X = 1.0
+THUMBNAIL_RESOLUTION_2X = 2.0
+
+
+class TaskThumbnail(CalibreTask):
+    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+        super(TaskThumbnail, self).__init__(task_message)
+        self.limit = limit
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.worker_db = db.CalibreDB(expire_on_commit=False)
+
+    def run(self, worker_thread):
+        if self.worker_db.session and use_IM:
+            thumbnails = self.get_thumbnail_book_ids()
+            thumbnail_book_ids = list(map(lambda t: t.book_id, thumbnails))
+            self.log.info(','.join([str(elem) for elem in thumbnail_book_ids]))
+            self.log.info(len(thumbnail_book_ids))
+
+            books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
+
+            count = len(books_without_thumbnails)
+            for i, book in enumerate(books_without_thumbnails):
+                thumbnails = self.get_thumbnails_for_book(thumbnails, book)
+                if thumbnails:
+                    for thumbnail in thumbnails:
+                        self.update_book_thumbnail(book, thumbnail)
+
+                else:
+                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_1X)
+                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_2X)
+
+                self.progress = (1.0 / count) * i
+
+        self._handleSuccess()
+        self.app_db_session.close()
+
+    def get_thumbnail_book_ids(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .group_by(ub.Thumbnail.book_id)\
+            .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
+            .all()
+
+    def get_books_without_thumbnails(self, thumbnail_book_ids):
+        return self.worker_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.id.notin_(thumbnail_book_ids))\
+            .limit(self.limit)\
+            .all()
+
+    def get_thumbnails_for_book(self, thumbnails, book):
+        results = list()
+        for thumbnail in thumbnails:
+            if thumbnail.book_id == book.id:
+                results.append(thumbnail)
+
+        return results
+
+    def update_book_thumbnail(self, book, thumbnail):
+        thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
+
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def create_book_thumbnail(self, book, resolution):
+        thumbnail = ub.Thumbnail()
+        thumbnail.book_id = book.id
+        thumbnail.resolution = resolution
+
+        self.app_db_session.add(thumbnail)
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def generate_book_thumbnail(self, book, thumbnail):
+        if book and thumbnail:
+            if config.config_use_google_drive:
+                self.log.info('google drive thumbnail')
+            else:
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if os.path.isfile(book_cover_filepath):
+                    with Image(filename=book_cover_filepath) as img:
+                        height = self.get_thumbnail_height(thumbnail)
+                        if img.height > height:
+                            width = self.get_thumbnail_width(height, img)
+                            img.resize(width=width, height=height, filter='lanczos')
+                            img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+
+    def get_thumbnail_height(self, thumbnail):
+        return int(225 * thumbnail.resolution)
+
+    def get_thumbnail_width(self, height, img):
+        percent = (height / float(img.height))
+        return int((float(img.width) * float(percent)))
+
+    def get_thumbnail_cache_dir(self):
+        if not os.path.isdir(_CACHE_DIR):
+            os.makedirs(_CACHE_DIR)
+
+        if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
+            os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
+
+        return os.path.join(_CACHE_DIR, 'thumbnails')
+
+    def get_thumbnail_cache_path(self, thumbnail):
+        if thumbnail:
+            return os.path.join(self.get_thumbnail_cache_dir(), thumbnail.filename)
+        return None
+
+    @property
+    def name(self):
+        return "Thumbnail"
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
new file mode 100644
index 00000000..6ccff56f
--- /dev/null
+++ b/cps/thumbnails.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+import os
+
+from . import logger, ub
+from .constants import CACHE_DIR as _CACHE_DIR
+from .services.worker import WorkerThread
+from .tasks.thumbnail import TaskThumbnail
+
+from datetime import datetime
+
+THUMBNAIL_RESOLUTION_1X = 1.0
+THUMBNAIL_RESOLUTION_2X = 2.0
+
+log = logger.create()
+
+
+def get_thumbnail_cache_dir():
+    if not os.path.isdir(_CACHE_DIR):
+        os.makedirs(_CACHE_DIR)
+
+    if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
+        os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
+
+    return os.path.join(_CACHE_DIR, 'thumbnails')
+
+
+def get_thumbnail_cache_path(thumbnail):
+    if thumbnail:
+        return os.path.join(get_thumbnail_cache_dir(), thumbnail.filename)
+
+    return None
+
+
+def cover_thumbnail_exists_for_book(book):
+    if book and book.has_cover:
+        thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
+        if thumbnail and thumbnail.expiration > datetime.utcnow():
+            thumbnail_path = get_thumbnail_cache_path(thumbnail)
+            return thumbnail_path and os.path.isfile(thumbnail_path)
+
+    return False
+
+
+def generate_thumbnails():
+    WorkerThread.add(None, TaskThumbnail())
diff --git a/cps/ub.py b/cps/ub.py
index dbc3b419..4500160f 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -40,13 +40,14 @@ except ImportError:
         oauth_support = False
 from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
-from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
+from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON, Numeric
 from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import constants
+from . import cli, constants
 
 
 session = None
@@ -434,6 +435,28 @@ class RemoteAuthToken(Base):
         return '<Token %r>' % self.id
 
 
+class Thumbnail(Base):
+    __tablename__ = 'thumbnail'
+
+    id = Column(Integer, primary_key=True)
+    book_id = Column(Integer)
+    uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
+    format = Column(String, default='jpeg')
+    resolution = Column(Numeric(precision=2, scale=1, asdecimal=False), default=1.0)
+    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
+
+    @hybrid_property
+    def extension(self):
+        if self.format == 'jpeg':
+            return 'jpg'
+        else:
+            return self.format
+
+    @hybrid_property
+    def filename(self):
+        return self.uuid + '.' + self.extension
+
+
 # Migrate database to current version, has to be updated after every database change. Currently migration from
 # everywhere to current should work. Migration is done by checking if relevant columns are existing, and than adding
 # rows with SQL commands
@@ -451,6 +474,8 @@ def migrate_Database(session):
         KoboStatistics.__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(), "thumbnail"):
+        Thumbnail.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "registration"):
         ReadBook.__table__.create(bind=engine)
         with engine.connect() as conn:
@@ -676,6 +701,13 @@ def init_db(app_db_path):
         create_anonymous_user(session)
 
 
+def get_new_session_instance():
+    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
+    new_session = scoped_session(sessionmaker())
+    new_session.configure(bind=new_engine)
+    return new_session
+
+
 def dispose():
     global session
 

From 21fce9a5b5b004c1fcf16aa74e96d27f7e4bde0f Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sat, 19 Dec 2020 02:58:40 -0600
Subject: [PATCH 002/220] Added background scheduler and scheduled thumbnail
 generation job

---
 cps.py                               |  4 ---
 cps/__init__.py                      |  9 ++++-
 cps/services/background_scheduler.py | 52 ++++++++++++++++++++++++++++
 cps/tasks/thumbnail.py               | 12 +++----
 cps/thumbnails.py                    |  4 ---
 requirements.txt                     |  1 +
 6 files changed, 66 insertions(+), 16 deletions(-)
 create mode 100644 cps/services/background_scheduler.py

diff --git a/cps.py b/cps.py
index e90a38d9..50ab0076 100755
--- a/cps.py
+++ b/cps.py
@@ -43,7 +43,6 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
-from cps.thumbnails import generate_thumbnails
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -79,9 +78,6 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
-
-    generate_thumbnails()
-
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/__init__.py b/cps/__init__.py
index 1a7dc868..fa85e15c 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -36,6 +36,8 @@ from flask_principal import Principal
 from . import config_sql, logger, cache_buster, cli, ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
+from .services.background_scheduler import BackgroundScheduler
+from .tasks.thumbnail import TaskThumbnail
 
 
 mimetypes.init()
@@ -95,7 +97,7 @@ def create_app():
         app.instance_path = app.instance_path.decode('utf-8')
 
     if os.environ.get('FLASK_DEBUG'):
-    	cache_buster.init_cache_busting(app)
+        cache_buster.init_cache_busting(app)
 
     log.info('Starting Calibre Web...')
     Principal(app)
@@ -115,8 +117,13 @@ def create_app():
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
 
+    scheduler = BackgroundScheduler()
+    # Generate 100 book cover thumbnails every 5 minutes
+    scheduler.add_task(user=None, task=lambda: TaskThumbnail(config=config, limit=100), trigger='interval', minutes=5)
+
     return app
 
+
 @babel.localeselector
 def get_locale():
     # if a user is logged in, use the locale from the user settings
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
new file mode 100644
index 00000000..efa57379
--- /dev/null
+++ b/cps/services/background_scheduler.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+import atexit
+
+from .. import logger
+from .worker import WorkerThread
+from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+
+
+class BackgroundScheduler:
+    _instance = None
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(BackgroundScheduler, cls).__new__(cls)
+
+            scheduler = BScheduler()
+            atexit.register(lambda: scheduler.shutdown())
+
+            cls.log = logger.create()
+            cls.scheduler = scheduler
+            cls.scheduler.start()
+
+        return cls._instance
+
+    def add(self, func, trigger, **trigger_args):
+        self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+
+    def add_task(self, user, task, trigger, **trigger_args):
+        def scheduled_task():
+            worker_task = task()
+            self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+            WorkerThread.add(user, worker_task)
+
+        self.add(func=scheduled_task, trigger=trigger, **trigger_args)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index c452ab41..378b688e 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,7 +19,7 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
-from cps import config, db, gdriveutils, logger, ub
+from cps import db, logger, ub
 from cps.constants import CACHE_DIR as _CACHE_DIR
 from cps.services.worker import CalibreTask
 from datetime import datetime, timedelta
@@ -36,8 +36,9 @@ THUMBNAIL_RESOLUTION_2X = 2.0
 
 
 class TaskThumbnail(CalibreTask):
-    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+    def __init__(self, config, limit=100, task_message=u'Generating cover thumbnails'):
         super(TaskThumbnail, self).__init__(task_message)
+        self.config = config
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -47,9 +48,6 @@ class TaskThumbnail(CalibreTask):
         if self.worker_db.session and use_IM:
             thumbnails = self.get_thumbnail_book_ids()
             thumbnail_book_ids = list(map(lambda t: t.book_id, thumbnails))
-            self.log.info(','.join([str(elem) for elem in thumbnail_book_ids]))
-            self.log.info(len(thumbnail_book_ids))
-
             books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
 
             count = len(books_without_thumbnails)
@@ -116,10 +114,10 @@ class TaskThumbnail(CalibreTask):
 
     def generate_book_thumbnail(self, book, thumbnail):
         if book and thumbnail:
-            if config.config_use_google_drive:
+            if self.config.config_use_google_drive:
                 self.log.info('google drive thumbnail')
             else:
-                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                book_cover_filepath = os.path.join(self.config.config_calibre_dir, book.path, 'cover.jpg')
                 if os.path.isfile(book_cover_filepath):
                     with Image(filename=book_cover_filepath) as img:
                         height = self.get_thumbnail_height(thumbnail)
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
index 6ccff56f..89e68f50 100644
--- a/cps/thumbnails.py
+++ b/cps/thumbnails.py
@@ -57,7 +57,3 @@ def cover_thumbnail_exists_for_book(book):
             return thumbnail_path and os.path.isfile(thumbnail_path)
 
     return False
-
-
-def generate_thumbnails():
-    WorkerThread.add(None, TaskThumbnail())
diff --git a/requirements.txt b/requirements.txt
index f154dd5b..9d0a8654 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+APScheduler==3.6.3
 Babel>=1.3, <2.9
 Flask-Babel>=0.11.1,<2.1.0
 Flask-Login>=0.3.2,<0.5.1

From e48bdf9d5a038d169046c0e5352d3c9d074769c6 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sun, 20 Dec 2020 03:11:21 -0600
Subject: [PATCH 003/220] Display thumbnails on the frontend, generate
 thumbnails from google drive

---
 cps.py                        |  5 ++++
 cps/__init__.py               |  6 -----
 cps/helper.py                 | 37 ++++++++++++++++++++---------
 cps/schedule.py               | 34 +++++++++++++++++++++++++++
 cps/tasks/thumbnail.py        | 44 +++++++++++++++++++++++++----------
 cps/templates/author.html     |  2 +-
 cps/templates/book_cover.html |  8 +++++++
 cps/templates/book_edit.html  |  4 +++-
 cps/templates/detail.html     |  3 ++-
 cps/templates/discover.html   |  3 ++-
 cps/templates/fragment.html   |  1 +
 cps/templates/grid.html       |  3 ++-
 cps/templates/index.html      |  5 ++--
 cps/templates/layout.html     |  1 +
 cps/templates/search.html     |  3 ++-
 cps/templates/shelf.html      |  3 ++-
 cps/thumbnails.py             |  9 ++-----
 cps/ub.py                     |  4 ++--
 cps/web.py                    | 11 ++++-----
 19 files changed, 133 insertions(+), 53 deletions(-)
 create mode 100644 cps/schedule.py
 create mode 100644 cps/templates/book_cover.html

diff --git a/cps.py b/cps.py
index 50ab0076..d63771eb 100755
--- a/cps.py
+++ b/cps.py
@@ -43,6 +43,7 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
+from cps.schedule import register_jobs
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -78,6 +79,10 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
+
+    # Register scheduled jobs
+    register_jobs()
+
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/__init__.py b/cps/__init__.py
index fa85e15c..6a6d361a 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -36,8 +36,6 @@ from flask_principal import Principal
 from . import config_sql, logger, cache_buster, cli, ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
-from .services.background_scheduler import BackgroundScheduler
-from .tasks.thumbnail import TaskThumbnail
 
 
 mimetypes.init()
@@ -117,10 +115,6 @@ def create_app():
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
 
-    scheduler = BackgroundScheduler()
-    # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskThumbnail(config=config, limit=100), trigger='interval', minutes=5)
-
     return app
 
 
diff --git a/cps/helper.py b/cps/helper.py
index 6fc6b02a..d3420a11 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -52,7 +52,7 @@ except ImportError:
 
 from . import calibre_db
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub
+from . import logger, config, get_locale, db, thumbnails, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
@@ -538,24 +538,27 @@ def get_cover_on_failure(use_generic_cover):
         return None
 
 
-def get_book_cover(book_id):
+def get_book_cover(book_id, resolution=1):
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
-def get_book_cover_with_uuid(book_uuid,
-                             use_generic_cover_on_failure=True):
+def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     book = calibre_db.get_book_by_uuid(book_uuid)
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_book_cover_internal(book, use_generic_cover_on_failure):
+def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, disable_thumbnail=False):
     if book and book.has_cover:
-        # if thumbnails.cover_thumbnail_exists_for_book(book):
-        #     thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
-        #     return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
-        # else:
-            # WorkerThread.add(None, TaskThumbnail(book, _(u'Generating cover thumbnail for: ' + book.title)))
+
+        # Send the book cover thumbnail if it exists in cache
+        if not disable_thumbnail:
+            thumbnail = get_book_cover_thumbnail(book, resolution)
+            if thumbnail:
+                if os.path.isfile(thumbnails.get_thumbnail_cache_path(thumbnail)):
+                    return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
+
+        # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
             try:
                 if not gd.is_gdrive_ready():
@@ -569,6 +572,8 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
             except Exception as ex:
                 log.debug_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
+
+        # Send the book cover from the Calibre directory
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
             if os.path.isfile(os.path.join(cover_file_path, "cover.jpg")):
@@ -579,6 +584,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
         return get_cover_on_failure(use_generic_cover_on_failure)
 
 
+def get_book_cover_thumbnail(book, resolution=1):
+    if book and book.has_cover:
+        return ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book.id)\
+            .filter(ub.Thumbnail.resolution == resolution)\
+            .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+            .first()
+
+
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
diff --git a/cps/schedule.py b/cps/schedule.py
new file mode 100644
index 00000000..5d2c94b9
--- /dev/null
+++ b/cps/schedule.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+
+from . import logger
+from .services.background_scheduler import BackgroundScheduler
+from .tasks.thumbnail import TaskThumbnail
+
+log = logger.create()
+
+
+def register_jobs():
+    scheduler = BackgroundScheduler()
+
+    # Generate 100 book cover thumbnails every 5 minutes
+    scheduler.add_task(user=None, task=lambda: TaskThumbnail(limit=100), trigger='interval', minutes=5)
+
+    # TODO: validate thumbnail scheduled task
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 378b688e..4e0c6db4 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,11 +19,13 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
-from cps import db, logger, ub
+from cps import config, db, gdriveutils, logger, ub
 from cps.constants import CACHE_DIR as _CACHE_DIR
 from cps.services.worker import CalibreTask
+from cps.thumbnails import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X
 from datetime import datetime, timedelta
 from sqlalchemy import func
+from urllib.request import urlopen
 
 try:
     from wand.image import Image
@@ -31,14 +33,10 @@ try:
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
-THUMBNAIL_RESOLUTION_1X = 1.0
-THUMBNAIL_RESOLUTION_2X = 2.0
-
 
 class TaskThumbnail(CalibreTask):
-    def __init__(self, config, limit=100, task_message=u'Generating cover thumbnails'):
+    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
         super(TaskThumbnail, self).__init__(task_message)
-        self.config = config
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -114,17 +112,39 @@ class TaskThumbnail(CalibreTask):
 
     def generate_book_thumbnail(self, book, thumbnail):
         if book and thumbnail:
-            if self.config.config_use_google_drive:
-                self.log.info('google drive thumbnail')
-            else:
-                book_cover_filepath = os.path.join(self.config.config_calibre_dir, book.path, 'cover.jpg')
-                if os.path.isfile(book_cover_filepath):
-                    with Image(filename=book_cover_filepath) as img:
+            if config.config_use_google_drive:
+                if not gdriveutils.is_gdrive_ready():
+                    raise Exception('Google Drive is configured but not ready')
+
+                web_content_link = gdriveutils.get_cover_via_gdrive(book.path)
+                if not web_content_link:
+                    raise Exception('Google Drive cover url not found')
+
+                stream = None
+                try:
+                    stream = urlopen(web_content_link)
+                    with Image(file=stream) as img:
                         height = self.get_thumbnail_height(thumbnail)
                         if img.height > height:
                             width = self.get_thumbnail_width(height, img)
                             img.resize(width=width, height=height, filter='lanczos')
                             img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+                except Exception as ex:
+                    # Bubble exception to calling function
+                    raise ex
+                finally:
+                    stream.close()
+            else:
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if not os.path.isfile(book_cover_filepath):
+                    raise Exception('Book cover file not found')
+
+                with Image(filename=book_cover_filepath) as img:
+                    height = self.get_thumbnail_height(thumbnail)
+                    if img.height > height:
+                        width = self.get_thumbnail_width(height, img)
+                        img.resize(width=width, height=height, filter='lanczos')
+                        img.save(filename=self.get_thumbnail_cache_path(thumbnail))
 
     def get_thumbnail_height(self, thumbnail):
         return int(225 * thumbnail.resolution)
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 7887aa4a..24ce876a 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,7 @@
     <div id="books" class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-          <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" />
+            {{ book_cover_image(entry.id, entry.title) }}
         </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
new file mode 100644
index 00000000..878c14a8
--- /dev/null
+++ b/cps/templates/book_cover.html
@@ -0,0 +1,8 @@
+{% macro book_cover_image(book_id, book_title) -%}
+    <img
+        srcset="{{ url_for('web.get_cover', book_id=book_id, resolution=1) }} 1x,
+                {{ url_for('web.get_cover', book_id=book_id, resolution=2) }} 2x"
+        src="{{ url_for('web.get_cover', book_id=book_id) }}"
+        alt="{{ book_title }}"
+    />
+{%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 003b33f9..881fa8ff 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,9 +1,11 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        <img src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>
+        {{ book_cover_image(book.id, book.title) }}
+<!--        <img src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>-->
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 503d1dbd..d3615563 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,8 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          <img src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />
+          {{ book_cover_image(entry.id, entry.title) }}
+<!--          <img src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />-->
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 3c858feb..33bafbbe 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover load-more">
@@ -8,7 +9,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-            <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              {{ book_cover_image(entry.id, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/fragment.html b/cps/templates/fragment.html
index 1421ea6a..901dd193 100644
--- a/cps/templates/fragment.html
+++ b/cps/templates/fragment.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 <div class="container-fluid">
   {% block body %}{% endblock %}
 </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index ce2c05ac..bc3ca4a2 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <h1 class="{{page}}">{{_(title)}}</h1>
@@ -28,7 +29,7 @@
               <div class="col-sm-3 col-lg-2 col-xs-6 book sortable" {% if entry[0].sort %}data-name="{{entry[0].series[0].name}}"{% endif %} data-id="{% if entry[0].series[0].name %}{{entry[0].series[0].name}}{% endif %}">
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
-                          <img src="{{ url_for('web.get_cover', book_id=entry[0].id) }}" alt="{{ entry[0].name }}"/>
+                          {{ book_cover_image(entry[0].id, entry[0].name) }}
                           <span class="badge">{{entry.count}}</span>
                       </a>
                   </div>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 1db73c89..c536884f 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if g.user.show_detail_random() %}
@@ -8,7 +9,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              {{ book_cover_image(entry.id, entry.title) }}
           </a>
       </div>
       <div class="meta">
@@ -82,7 +83,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
+              {{ book_cover_image(entry.id, entry.title) }}
           </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 3b89a7ce..5df471a9 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,4 +1,5 @@
 {% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal %}
+{% from 'book_cover.html' import book_cover_image %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index aedb6f45..56b12154 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -43,7 +44,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-            <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+               {{ book_cover_image(entry.id, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index f7e3c1ae..7a678ea6 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -30,7 +31,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {{ book_cover_image(entry.id, entry.title) }}
             </a>
       </div>
       <div class="meta">
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
index 89e68f50..ea7aac86 100644
--- a/cps/thumbnails.py
+++ b/cps/thumbnails.py
@@ -21,13 +21,11 @@ import os
 
 from . import logger, ub
 from .constants import CACHE_DIR as _CACHE_DIR
-from .services.worker import WorkerThread
-from .tasks.thumbnail import TaskThumbnail
 
 from datetime import datetime
 
-THUMBNAIL_RESOLUTION_1X = 1.0
-THUMBNAIL_RESOLUTION_2X = 2.0
+THUMBNAIL_RESOLUTION_1X = 1
+THUMBNAIL_RESOLUTION_2X = 2
 
 log = logger.create()
 
@@ -35,17 +33,14 @@ log = logger.create()
 def get_thumbnail_cache_dir():
     if not os.path.isdir(_CACHE_DIR):
         os.makedirs(_CACHE_DIR)
-
     if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
         os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
-
     return os.path.join(_CACHE_DIR, 'thumbnails')
 
 
 def get_thumbnail_cache_path(thumbnail):
     if thumbnail:
         return os.path.join(get_thumbnail_cache_dir(), thumbnail.filename)
-
     return None
 
 
diff --git a/cps/ub.py b/cps/ub.py
index 4500160f..0b5a65e7 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -40,7 +40,7 @@ except ImportError:
         oauth_support = False
 from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
-from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON, Numeric
+from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm.attributes import flag_modified
@@ -442,7 +442,7 @@ class Thumbnail(Base):
     book_id = Column(Integer)
     uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
     format = Column(String, default='jpeg')
-    resolution = Column(Numeric(precision=2, scale=1, asdecimal=False), default=1.0)
+    resolution = Column(SmallInteger, default=1)
     expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
 
     @hybrid_property
diff --git a/cps/web.py b/cps/web.py
index 4baf82cb..27a5849b 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1171,14 +1171,17 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
+@web.route("/cover/<int:book_id>/<int:resolution>")
 @login_required_if_no_ano
-def get_cover(book_id):
-    return get_book_cover(book_id)
+def get_cover(book_id, resolution=1):
+    return get_book_cover(book_id, resolution)
+
 
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
 
+
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/show/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1205,7 +1208,6 @@ def serve_book(book_id, book_format, anyname):
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)
 
 
-
 @web.route("/download/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/download/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1387,9 +1389,6 @@ def logout():
     return redirect(url_for('web.login'))
 
 
-
-
-
 # ################################### Users own configuration #########################################################
 
 

From 541fc7e14ebe3716fce58593a2ff3f5b23403e3d Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Tue, 22 Dec 2020 17:49:21 -0600
Subject: [PATCH 004/220] fixed thumbnail generate tasks, added thumbnail
 cleanup task, added reconnect db scheduled job

---
 cps/fs.py              |  61 ++++++++++++++
 cps/helper.py          |   7 +-
 cps/schedule.py        |  18 ++++-
 cps/services/worker.py |  17 +++-
 cps/tasks/thumbnail.py | 177 +++++++++++++++++++++++++++++++----------
 cps/thumbnails.py      |  54 -------------
 cps/ub.py              |  28 ++++---
 7 files changed, 245 insertions(+), 117 deletions(-)
 create mode 100644 cps/fs.py
 delete mode 100644 cps/thumbnails.py

diff --git a/cps/fs.py b/cps/fs.py
new file mode 100644
index 00000000..699d5991
--- /dev/null
+++ b/cps/fs.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+from .constants import CACHE_DIR
+from os import listdir, makedirs, remove
+from os.path import isdir, isfile, join
+from shutil import rmtree
+
+CACHE_TYPE_THUMBNAILS = 'thumbnails'
+
+
+class FileSystem:
+    _instance = None
+    _cache_dir = CACHE_DIR
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(FileSystem, cls).__new__(cls)
+        return cls._instance
+
+    def get_cache_dir(self, cache_type=None):
+        if not isdir(self._cache_dir):
+            makedirs(self._cache_dir)
+
+        if cache_type and not isdir(join(self._cache_dir, cache_type)):
+            makedirs(join(self._cache_dir, cache_type))
+
+        return join(self._cache_dir, cache_type) if cache_type else self._cache_dir
+
+    def get_cache_file_path(self, filename, cache_type=None):
+        return join(self.get_cache_dir(cache_type), filename) if filename else None
+
+    def list_cache_files(self, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file))]
+
+    def delete_cache_dir(self, cache_type=None):
+        if not cache_type and isdir(self._cache_dir):
+            rmtree(self._cache_dir)
+        if cache_type and isdir(join(self._cache_dir, cache_type)):
+            rmtree(join(self._cache_dir, cache_type))
+
+    def delete_cache_file(self, filename, cache_type=None):
+        if isfile(join(self.get_cache_dir(cache_type), filename)):
+            remove(join(self.get_cache_dir(cache_type), filename))
diff --git a/cps/helper.py b/cps/helper.py
index d3420a11..271ab3e9 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -52,7 +52,7 @@ except ImportError:
 
 from . import calibre_db
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, thumbnails, ub
+from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
@@ -555,8 +555,9 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, di
         if not disable_thumbnail:
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
-                if os.path.isfile(thumbnails.get_thumbnail_cache_path(thumbnail)):
-                    return send_from_directory(thumbnails.get_thumbnail_cache_dir(), thumbnail.filename)
+                cache = fs.FileSystem()
+                if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                    return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
 
         # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
diff --git a/cps/schedule.py b/cps/schedule.py
index 5d2c94b9..5c658e41 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,9 +18,9 @@
 
 from __future__ import division, print_function, unicode_literals
 
-from . import logger
+from . import config, db, logger, ub
 from .services.background_scheduler import BackgroundScheduler
-from .tasks.thumbnail import TaskThumbnail
+from .tasks.thumbnail import TaskCleanupCoverThumbnailCache, TaskGenerateCoverThumbnails
 
 log = logger.create()
 
@@ -29,6 +29,16 @@ def register_jobs():
     scheduler = BackgroundScheduler()
 
     # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskThumbnail(limit=100), trigger='interval', minutes=5)
+    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='interval', minutes=5)
 
-    # TODO: validate thumbnail scheduled task
+    # Cleanup book cover cache every day at 4am
+    scheduler.add_task(user=None, task=lambda: TaskCleanupCoverThumbnailCache(), trigger='cron', hour=4)
+
+    # Reconnect metadata.db every 4 hours
+    scheduler.add(func=reconnect_db_job, trigger='interval', hours=4)
+
+
+def reconnect_db_job():
+    log.info('Running background task: reconnect to calibre database')
+    calibre_db = db.CalibreDB()
+    calibre_db.reconnect_db(config, ub.app_DB_path)
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 072674a0..2b6816db 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -35,7 +35,6 @@ def _get_main_thread():
     raise Exception("main thread not found?!")
 
 
-
 class ImprovedQueue(queue.Queue):
     def to_list(self):
         """
@@ -45,7 +44,8 @@ class ImprovedQueue(queue.Queue):
         with self.mutex:
             return list(self.queue)
 
-#Class for all worker tasks in the background
+
+# Class for all worker tasks in the background
 class WorkerThread(threading.Thread):
     _instance = None
 
@@ -127,6 +127,10 @@ class WorkerThread(threading.Thread):
                 # CalibreTask.start() should wrap all exceptions in it's own error handling
                 item.task.start(self)
 
+            # remove self_cleanup tasks from list
+            if item.task.self_cleanup:
+                self.dequeued.remove(item)
+
             self.queue.task_done()
 
 
@@ -141,6 +145,7 @@ class CalibreTask:
         self.end_time = None
         self.message = message
         self.id = uuid.uuid4()
+        self.self_cleanup = False
 
     @abc.abstractmethod
     def run(self, worker_thread):
@@ -209,6 +214,14 @@ class CalibreTask:
         # todo: throw error if outside of [0,1]
         self._progress = x
 
+    @property
+    def self_cleanup(self):
+        return self._self_cleanup
+
+    @self_cleanup.setter
+    def self_cleanup(self, is_self_cleanup):
+        self._self_cleanup = is_self_cleanup
+
     def _handleError(self, error_message):
         self.stat = STAT_FAIL
         self.progress = 1
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 4e0c6db4..f61eb4a7 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,13 +19,15 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
-from cps import config, db, gdriveutils, logger, ub
-from cps.constants import CACHE_DIR as _CACHE_DIR
+from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask
-from cps.thumbnails import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X
 from datetime import datetime, timedelta
 from sqlalchemy import func
-from urllib.request import urlopen
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
 
 try:
     from wand.image import Image
@@ -33,73 +35,92 @@ try:
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
+THUMBNAIL_RESOLUTION_1X = 1
+THUMBNAIL_RESOLUTION_2X = 2
 
-class TaskThumbnail(CalibreTask):
+
+class TaskGenerateCoverThumbnails(CalibreTask):
     def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
-        super(TaskThumbnail, self).__init__(task_message)
+        super(TaskGenerateCoverThumbnails, self).__init__(task_message)
+        self.self_cleanup = True
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
-        self.worker_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+        self.resolutions = [
+            THUMBNAIL_RESOLUTION_1X,
+            THUMBNAIL_RESOLUTION_2X
+        ]
 
     def run(self, worker_thread):
-        if self.worker_db.session and use_IM:
-            thumbnails = self.get_thumbnail_book_ids()
-            thumbnail_book_ids = list(map(lambda t: t.book_id, thumbnails))
+        if self.calibre_db.session and use_IM:
+            expired_thumbnails = self.get_expired_thumbnails()
+            thumbnail_book_ids = self.get_thumbnail_book_ids()
             books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
 
             count = len(books_without_thumbnails)
             for i, book in enumerate(books_without_thumbnails):
-                thumbnails = self.get_thumbnails_for_book(thumbnails, book)
-                if thumbnails:
-                    for thumbnail in thumbnails:
-                        self.update_book_thumbnail(book, thumbnail)
-
-                else:
-                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_1X)
-                    self.create_book_thumbnail(book, THUMBNAIL_RESOLUTION_2X)
+                for resolution in self.resolutions:
+                    expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
+                        book,
+                        resolution,
+                        expired_thumbnails
+                    )
+                    if expired_thumbnail:
+                        self.update_book_thumbnail(book, expired_thumbnail)
+                    else:
+                        self.create_book_thumbnail(book, resolution)
 
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()
-        self.app_db_session.close()
+        self.app_db_session.remove()
+
+    def get_expired_thumbnails(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.expiration < datetime.utcnow())\
+            .all()
 
     def get_thumbnail_book_ids(self):
         return self.app_db_session\
-            .query(ub.Thumbnail)\
+            .query(ub.Thumbnail.book_id)\
             .group_by(ub.Thumbnail.book_id)\
             .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
-            .all()
+            .distinct()
 
     def get_books_without_thumbnails(self, thumbnail_book_ids):
-        return self.worker_db.session\
+        return self.calibre_db.session\
             .query(db.Books)\
             .filter(db.Books.has_cover == 1)\
             .filter(db.Books.id.notin_(thumbnail_book_ids))\
             .limit(self.limit)\
             .all()
 
-    def get_thumbnails_for_book(self, thumbnails, book):
-        results = list()
-        for thumbnail in thumbnails:
-            if thumbnail.book_id == book.id:
-                results.append(thumbnail)
+    def get_expired_thumbnail_for_book_and_resolution(self, book, resolution, expired_thumbnails):
+        for thumbnail in expired_thumbnails:
+            if thumbnail.book_id == book.id and thumbnail.resolution == resolution:
+                return thumbnail
 
-        return results
+        return None
 
     def update_book_thumbnail(self, book, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
         thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
 
         try:
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
             self._handleError(u'Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def create_book_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
         thumbnail.book_id = book.id
+        thumbnail.format = 'jpeg'
         thumbnail.resolution = resolution
 
         self.app_db_session.add(thumbnail)
@@ -107,6 +128,7 @@ class TaskThumbnail(CalibreTask):
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
+            self.log.info(u'Error creating book thumbnail: ' + str(ex))
             self._handleError(u'Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -128,9 +150,12 @@ class TaskThumbnail(CalibreTask):
                         if img.height > height:
                             width = self.get_thumbnail_width(height, img)
                             img.resize(width=width, height=height, filter='lanczos')
-                            img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+                            img.format = thumbnail.format
+                            filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                            img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
+                    self.log.info(u'Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
                     stream.close()
@@ -144,7 +169,9 @@ class TaskThumbnail(CalibreTask):
                     if img.height > height:
                         width = self.get_thumbnail_width(height, img)
                         img.resize(width=width, height=height, filter='lanczos')
-                        img.save(filename=self.get_thumbnail_cache_path(thumbnail))
+                        img.format = thumbnail.format
+                        filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                        img.save(filename=filename)
 
     def get_thumbnail_height(self, thumbnail):
         return int(225 * thumbnail.resolution)
@@ -153,20 +180,88 @@ class TaskThumbnail(CalibreTask):
         percent = (height / float(img.height))
         return int((float(img.width) * float(percent)))
 
-    def get_thumbnail_cache_dir(self):
-        if not os.path.isdir(_CACHE_DIR):
-            os.makedirs(_CACHE_DIR)
+    @property
+    def name(self):
+        return "GenerateCoverThumbnails"
 
-        if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
-            os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
 
-        return os.path.join(_CACHE_DIR, 'thumbnails')
+class TaskCleanupCoverThumbnailCache(CalibreTask):
+    def __init__(self, task_message=u'Validating cover thumbnail cache'):
+        super(TaskCleanupCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
 
-    def get_thumbnail_cache_path(self, thumbnail):
-        if thumbnail:
-            return os.path.join(self.get_thumbnail_cache_dir(), thumbnail.filename)
-        return None
+    def run(self, worker_thread):
+        cached_thumbnail_files = self.cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
+        # Expire thumbnails in the database if the cached file is missing
+        # This case will happen if a user deletes the cache dir or cached files
+        if self.app_db_session:
+            self.expire_missing_thumbnails(cached_thumbnail_files)
+            self.progress = 0.33
+
+        # Delete thumbnails in the database if the book has been removed
+        # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
+        if self.app_db_session and self.calibre_db:
+            book_ids = self.get_book_ids()
+            self.delete_thumbnails_for_missing_books(book_ids)
+            self.progress = 0.66
+
+        # Delete extraneous cached thumbnail files
+        # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
+        if self.app_db_session:
+            db_thumbnail_files = self.get_thumbnail_filenames()
+            self.delete_extraneous_thumbnail_files(cached_thumbnail_files, db_thumbnail_files)
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def expire_missing_thumbnails(self, filenames):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.filename.notin_(filenames))\
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_book_ids(self):
+        results = self.calibre_db.session\
+            .query(db.Books.id)\
+            .filter(db.Books.has_cover == 1)\
+            .distinct()
+
+        return [value for value, in results]
+
+    def delete_thumbnails_for_missing_books(self, book_ids):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.book_id.notin_(book_ids))\
+                .delete(synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(str(ex))
+            self._handleError(u'Error deleting thumbnails for missing books: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_thumbnail_filenames(self):
+        results = self.app_db_session\
+            .query(ub.Thumbnail.filename)\
+            .all()
+
+        return [thumbnail for thumbnail, in results]
+
+    def delete_extraneous_thumbnail_files(self, cached_thumbnail_files, db_thumbnail_files):
+        extraneous_files = list(set(cached_thumbnail_files).difference(db_thumbnail_files))
+        for file in extraneous_files:
+            self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
 
     @property
     def name(self):
-        return "Thumbnail"
+        return "CleanupCoverThumbnailCache"
diff --git a/cps/thumbnails.py b/cps/thumbnails.py
deleted file mode 100644
index ea7aac86..00000000
--- a/cps/thumbnails.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#     Copyright (C) 2020 mmonkey
-#
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import division, print_function, unicode_literals
-import os
-
-from . import logger, ub
-from .constants import CACHE_DIR as _CACHE_DIR
-
-from datetime import datetime
-
-THUMBNAIL_RESOLUTION_1X = 1
-THUMBNAIL_RESOLUTION_2X = 2
-
-log = logger.create()
-
-
-def get_thumbnail_cache_dir():
-    if not os.path.isdir(_CACHE_DIR):
-        os.makedirs(_CACHE_DIR)
-    if not os.path.isdir(os.path.join(_CACHE_DIR, 'thumbnails')):
-        os.makedirs(os.path.join(_CACHE_DIR, 'thumbnails'))
-    return os.path.join(_CACHE_DIR, 'thumbnails')
-
-
-def get_thumbnail_cache_path(thumbnail):
-    if thumbnail:
-        return os.path.join(get_thumbnail_cache_dir(), thumbnail.filename)
-    return None
-
-
-def cover_thumbnail_exists_for_book(book):
-    if book and book.has_cover:
-        thumbnail = ub.session.query(ub.Thumbnail).filter(ub.Thumbnail.book_id == book.id).first()
-        if thumbnail and thumbnail.expiration > datetime.utcnow():
-            thumbnail_path = get_thumbnail_cache_path(thumbnail)
-            return thumbnail_path and os.path.isfile(thumbnail_path)
-
-    return False
diff --git a/cps/ub.py b/cps/ub.py
index 0b5a65e7..30abd728 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -18,6 +18,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+import atexit
 import os
 import sys
 import datetime
@@ -42,12 +43,11 @@ from sqlalchemy import create_engine, exc, exists, event
 from sqlalchemy import Column, ForeignKey
 from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import cli, constants
+from . import cli, constants, logger
 
 
 session = None
@@ -435,6 +435,14 @@ class RemoteAuthToken(Base):
         return '<Token %r>' % self.id
 
 
+def filename(context):
+    file_format = context.get_current_parameters()['format']
+    if file_format == 'jpeg':
+        return context.get_current_parameters()['uuid'] + '.jpg'
+    else:
+        return context.get_current_parameters()['uuid'] + '.' + file_format
+
+
 class Thumbnail(Base):
     __tablename__ = 'thumbnail'
 
@@ -443,19 +451,10 @@ class Thumbnail(Base):
     uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
     format = Column(String, default='jpeg')
     resolution = Column(SmallInteger, default=1)
+    filename = Column(String, default=filename)
+    generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
     expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
 
-    @hybrid_property
-    def extension(self):
-        if self.format == 'jpeg':
-            return 'jpg'
-        else:
-            return self.format
-
-    @hybrid_property
-    def filename(self):
-        return self.uuid + '.' + self.extension
-
 
 # Migrate database to current version, has to be updated after every database change. Currently migration from
 # everywhere to current should work. Migration is done by checking if relevant columns are existing, and than adding
@@ -705,6 +704,9 @@ def get_new_session_instance():
     new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
     new_session = scoped_session(sessionmaker())
     new_session.configure(bind=new_engine)
+
+    atexit.register(lambda: new_session.remove() if new_session else True)
+
     return new_session
 
 

From 626051e4892ef42d65e16f01932ae8ce48342c22 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 23 Dec 2020 03:25:25 -0600
Subject: [PATCH 005/220] Added clear cache button to admin settings, updated
 cache busting for book cover images

---
 cps/admin.py                  | 19 +++++++-
 cps/editbooks.py              |  2 +
 cps/helper.py                 | 23 +++++++---
 cps/jinjia.py                 |  6 +++
 cps/schedule.py               | 12 +----
 cps/static/css/caliBlur.css   | 82 ++++++++++++++++++++++++++++-------
 cps/static/js/main.js         | 12 +++++
 cps/tasks/database.py         | 49 +++++++++++++++++++++
 cps/tasks/thumbnail.py        | 58 ++++++++++++++++++++++++-
 cps/templates/admin.html      | 36 +++++++++++----
 cps/templates/author.html     |  2 +-
 cps/templates/book_cover.html |  8 ++--
 cps/templates/book_edit.html  |  3 +-
 cps/templates/detail.html     |  3 +-
 cps/templates/discover.html   |  2 +-
 cps/templates/grid.html       |  2 +-
 cps/templates/index.html      |  4 +-
 cps/templates/search.html     |  2 +-
 cps/templates/shelf.html      |  2 +-
 cps/web.py                    |  8 +++-
 20 files changed, 278 insertions(+), 57 deletions(-)
 create mode 100644 cps/tasks/database.py

diff --git a/cps/admin.py b/cps/admin.py
index 8b3ca247..dbc1b708 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -38,7 +38,7 @@ from sqlalchemy import and_
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_
 
-from . import constants, logger, helper, services
+from . import constants, logger, helper, services, fs
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash
 from .gdriveutils import is_gdrive_ready, gdrive_support
@@ -157,6 +157,23 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
+@admi.route("/clear-cache")
+@login_required
+@admin_required
+def clear_cache():
+    cache_type = request.args.get('cache_type'.strip())
+    showtext = {}
+
+    if cache_type == fs.CACHE_TYPE_THUMBNAILS:
+        log.info('clearing cover thumbnail cache')
+        showtext['text'] = _(u'Cleared cover thumbnail cache')
+        helper.clear_cover_thumbnail_cache()
+        return json.dumps(showtext)
+
+    showtext['text'] = _(u'Unknown command')
+    return json.dumps(showtext)
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 08ee93b1..6d26ebca 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -595,6 +595,7 @@ def upload_cover(request, book):
                 abort(403)
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
+                helper.clear_cover_thumbnail_cache(book.id)
                 return True
             else:
                 flash(message, category="error")
@@ -684,6 +685,7 @@ def edit_book(book_id):
                         if result is True:
                             book.has_cover = 1
                             modif_date = True
+                            helper.clear_cover_thumbnail_cache(book.id)
                         else:
                             flash(error, category="error")
 
diff --git a/cps/helper.py b/cps/helper.py
index 271ab3e9..0b0c675f 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -58,6 +58,7 @@ from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
 from .tasks.mail import TaskEmail
+from .tasks.thumbnail import TaskClearCoverThumbnailCache
 
 log = logger.create()
 
@@ -525,6 +526,7 @@ def update_dir_stucture(book_id, calibrepath, first_author=None, orignal_filepat
 
 
 def delete_book(book, calibrepath, book_format):
+    clear_cover_thumbnail_cache(book.id)
     if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
@@ -538,9 +540,9 @@ def get_cover_on_failure(use_generic_cover):
         return None
 
 
-def get_book_cover(book_id, resolution=1):
+def get_book_cover(book_id):
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+    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):
@@ -548,11 +550,19 @@ def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, disable_thumbnail=False):
+def get_cached_book_cover(cache_id):
+    parts = cache_id.split('_')
+    book_uuid = parts[0] if len(parts) else None
+    resolution = parts[2] if len(parts) > 2 else None
+    book = calibre_db.get_book_by_uuid(book_uuid) if book_uuid else None
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+
+
+def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
 
         # Send the book cover thumbnail if it exists in cache
-        if not disable_thumbnail:
+        if resolution:
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
                 cache = fs.FileSystem()
@@ -585,7 +595,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=1, di
         return get_cover_on_failure(use_generic_cover_on_failure)
 
 
-def get_book_cover_thumbnail(book, resolution=1):
+def get_book_cover_thumbnail(book, resolution):
     if book and book.has_cover:
         return ub.session\
             .query(ub.Thumbnail)\
@@ -846,3 +856,6 @@ def get_download_link(book_id, book_format, client):
     else:
         abort(404)
 
+
+def clear_cover_thumbnail_cache(book_id=None):
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 688d1fba..bf81c059 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -128,8 +128,14 @@ def formatseriesindex_filter(series_index):
             return series_index
     return 0
 
+
 @jinjia.app_template_filter('uuidfilter')
 def uuidfilter(var):
     return uuid4()
 
 
+@jinjia.app_template_filter('book_cover_cache_id')
+def book_cover_cache_id(book, resolution=None):
+    timestamp = int(book.last_modified.timestamp() * 1000)
+    cache_bust = str(book.uuid) + '_' + str(timestamp)
+    return cache_bust if not resolution else cache_bust + '_' + str(resolution)
diff --git a/cps/schedule.py b/cps/schedule.py
index 5c658e41..f349a231 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,12 +18,10 @@
 
 from __future__ import division, print_function, unicode_literals
 
-from . import config, db, logger, ub
 from .services.background_scheduler import BackgroundScheduler
+from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskCleanupCoverThumbnailCache, TaskGenerateCoverThumbnails
 
-log = logger.create()
-
 
 def register_jobs():
     scheduler = BackgroundScheduler()
@@ -35,10 +33,4 @@ def register_jobs():
     scheduler.add_task(user=None, task=lambda: TaskCleanupCoverThumbnailCache(), trigger='cron', hour=4)
 
     # Reconnect metadata.db every 4 hours
-    scheduler.add(func=reconnect_db_job, trigger='interval', hours=4)
-
-
-def reconnect_db_job():
-    log.info('Running background task: reconnect to calibre database')
-    calibre_db = db.CalibreDB()
-    calibre_db.reconnect_db(config, ub.app_DB_path)
+    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=4)
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index d085608d..da5d2933 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -5167,7 +5167,7 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
     pointer-events: none
 }
 
-#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
+#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #ClearCacheDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
     cursor: pointer
 }
 
@@ -5254,7 +5254,7 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
     margin-bottom: 20px
 }
 
-body.admin:not(.modal-open) .btn-default {
+body.admin .btn-default {
     margin-bottom: 10px
 }
 
@@ -5485,7 +5485,7 @@ body.admin.modal-open .navbar {
     z-index: 0 !important
 }
 
-#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal {
+#RestartDialog, #ShutdownDialog, #StatusDialog, #ClearCacheDialog, #deleteModal {
     top: 0;
     overflow: hidden;
     padding-top: 70px;
@@ -5495,7 +5495,7 @@ body.admin.modal-open .navbar {
     background: rgba(0, 0, 0, .5)
 }
 
-#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before {
+#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #ClearCacheDialog:before, #deleteModal:before {
     content: "\E208";
     padding-right: 10px;
     display: block;
@@ -5517,18 +5517,18 @@ body.admin.modal-open .navbar {
     z-index: 99
 }
 
-#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
     -webkit-transform: translate(0, 0);
     -ms-transform: translate(0, 0);
     transform: translate(0, 0)
 }
 
-#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
     width: 450px;
     margin: auto
 }
 
-#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
     max-height: calc(100% - 90px);
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
@@ -5539,7 +5539,7 @@ body.admin.modal-open .navbar {
     width: 450px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
     padding: 15px 20px;
     border-radius: 3px 3px 0 0;
     line-height: 1.71428571;
@@ -5552,7 +5552,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     padding-right: 10px;
     font-size: 18px;
     color: #999;
@@ -5576,6 +5576,11 @@ body.admin.modal-open .navbar {
     font-family: plex-icons-new, serif
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before {
+    content: "\EA15";
+    font-family: plex-icons-new, serif
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
     font-family: plex-icons-new, serif
@@ -5599,6 +5604,12 @@ body.admin.modal-open .navbar {
     font-size: 20px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:after {
+    content: "Clear Cover Thumbnail Cache";
+    display: inline-block;
+    font-size: 20px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:after {
     content: "Delete Book";
     display: inline-block;
@@ -5629,7 +5640,17 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body {
+    padding: 20px 20px 10px;
+    font-size: 16px;
+    line-height: 1.6em;
+    font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif;
+    color: #eee;
+    background: #282828;
+    text-align: left
+}
+
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
     padding: 20px 20px 0 0;
     font-size: 16px;
     line-height: 1.6em;
@@ -5638,7 +5659,7 @@ body.admin.modal-open .navbar {
     background: #282828
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     float: right;
     z-index: 9;
     position: relative;
@@ -5674,6 +5695,18 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > #clear_cache {
+    float: right;
+    z-index: 9;
+    position: relative;
+    margin: 25px 0 0 10px;
+    min-width: 80px;
+    padding: 10px 18px;
+    font-size: 16px;
+    line-height: 1.33;
+    border-radius: 3px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
@@ -5694,11 +5727,15 @@ body.admin.modal-open .navbar {
     margin: 55px 0 0 10px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache) {
+    margin: 25px 0 0 10px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     margin: 0 0 0 10px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
     background-color: hsla(0, 0%, 100%, .3)
 }
 
@@ -5732,6 +5769,21 @@ body.admin.modal-open .navbar {
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body:after {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 72px;
+    background-color: #323232;
+    border-radius: 0 0 3px 3px;
+    left: 0;
+    margin-top: 10px;
+    z-index: 0;
+    border-top: 1px solid #222;
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+    box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
+}
+
 #deleteButton {
     position: fixed;
     top: 60px;
@@ -7322,11 +7374,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         background-color: transparent !important
     }
 
-    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
         max-width: calc(100vw - 40px)
     }
 
-    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
         max-width: calc(100vw - 40px);
         left: 0
     }
@@ -7476,7 +7528,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         padding: 30px 15px
     }
 
-    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
         left: auto;
         right: 34px
     }
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 3fbaed88..d8c1863f 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -405,6 +405,18 @@ $(function() {
             }
         });
     });
+    $("#clear_cache").click(function () {
+        $("#spinner3").show();
+        $.ajax({
+            dataType: "json",
+            url: window.location.pathname + "/../../clear-cache",
+            data: {"cache_type":"thumbnails"},
+            success: function(data) {
+                $("#spinner3").hide();
+                $("#ClearCacheDialog").modal("hide");
+            }
+        });
+    });
 
     // Init all data control handlers to default
     $("input[data-control]").trigger("change");
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
new file mode 100644
index 00000000..11f0186d
--- /dev/null
+++ b/cps/tasks/database.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+
+from cps import config, logger
+from cps.services.worker import CalibreTask
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
+
+
+class TaskReconnectDatabase(CalibreTask):
+    def __init__(self, task_message=u'Reconnecting Calibre database'):
+        super(TaskReconnectDatabase, self).__init__(task_message)
+        self.log = logger.create()
+        self.listen_address = config.get_config_ipaddress()
+        self.listen_port = config.config_port
+
+    def run(self, worker_thread):
+        address = self.listen_address if self.listen_address else 'localhost'
+        port = self.listen_port if self.listen_port else 8083
+
+        try:
+            urlopen('http://' + address + ':' + str(port) + '/reconnect')
+            self._handleSuccess()
+        except Exception as ex:
+            self._handleError(u'Unable to reconnect Calibre database: ' + str(ex))
+
+    @property
+    def name(self):
+        return "Reconnect Database"
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index f61eb4a7..b541bc70 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -42,7 +42,6 @@ THUMBNAIL_RESOLUTION_2X = 2
 class TaskGenerateCoverThumbnails(CalibreTask):
     def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
-        self.self_cleanup = True
         self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -186,7 +185,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
 
 class TaskCleanupCoverThumbnailCache(CalibreTask):
-    def __init__(self, task_message=u'Validating cover thumbnail cache'):
+    def __init__(self, task_message=u'Cleaning up cover thumbnail cache'):
         super(TaskCleanupCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -265,3 +264,58 @@ class TaskCleanupCoverThumbnailCache(CalibreTask):
     @property
     def name(self):
         return "CleanupCoverThumbnailCache"
+
+
+class TaskClearCoverThumbnailCache(CalibreTask):
+    def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
+        super(TaskClearCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.book_id = book_id
+        self.app_db_session = ub.get_new_session_instance()
+        self.cache = fs.FileSystem()
+
+    def run(self, worker_thread):
+        if self.app_db_session:
+            if self.book_id:
+                thumbnails = self.get_thumbnails_for_book(self.book_id)
+                for thumbnail in thumbnails:
+                    self.expire_and_delete_thumbnail(thumbnail)
+            else:
+                self.expire_and_delete_all_thumbnails()
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_thumbnails_for_book(self, book_id):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book_id)\
+            .all()
+
+    def expire_and_delete_thumbnail(self, thumbnail):
+        thumbnail.expiration = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnail: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def expire_and_delete_all_thumbnails(self):
+        self.app_db_session\
+            .query(ub.Thumbnail)\
+            .update({'expiration': datetime.utcnow()})
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnails: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnails: ' + str(ex))
+            self.app_db_session.rollback()
+
+    @property
+    def name(self):
+        return "ClearCoverThumbnailCache"
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 1ef64157..e3d20db3 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -139,15 +139,18 @@
     </div>
   </div>
 
-    <div class="row form-group">
+  <div class="row form-group">
     <h2>{{_('Administration')}}</h2>
-      <div class="btn btn-default"><a id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a></div>
-      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
-    </div>
-    <div class="row form-group">
-      <div class="btn btn-default" id="restart_database" data-toggle="modal" data-target="#StatusDialog">{{_('Reconnect Calibre Database')}}</div>
-      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
-      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
+    <div class="btn btn-default"><a id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a></div>
+    <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
+  </div>
+  <div class="row form-group">
+    <div class="btn btn-default" id="restart_database" data-toggle="modal" data-target="#StatusDialog">{{_('Reconnect Calibre Database')}}</div>
+    <div class="btn btn-default" id="clear_cover_thumbnail_cache" data-toggle="modal" data-target="#ClearCacheDialog">{{_('Clear Cover Thumbnail Cache')}}</div>
+  </div>
+  <div class="row form-group">
+    <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
+    <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
   </div>
 
   <div class="row">
@@ -226,4 +229,21 @@
     </div>
   </div>
 </div>
+<div id="ClearCacheDialog" class="modal fade" role="dialog">
+  <div class="modal-dialog modal-sm">
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header bg-info"></div>
+      <div class="modal-body text-center">
+        <p>{{_('Are you sure you want to clear the cover thumbnail cache?')}}</p>
+        <div id="spinner3" class="spinner" style="display:none;">
+          <img id="img-spinner3" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
+        </div>
+        <p></p>
+        <button type="button" class="btn btn-default" id="clear_cache" >{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 24ce876a..3cf3fb4b 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,7 @@
     <div id="books" class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-            {{ book_cover_image(entry.id, entry.title) }}
+            {{ book_cover_image(entry, entry.title) }}
         </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 878c14a8..3f0ed154 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,8 +1,8 @@
-{% macro book_cover_image(book_id, book_title) -%}
+{% macro book_cover_image(book, book_title) -%}
     <img
-        srcset="{{ url_for('web.get_cover', book_id=book_id, resolution=1) }} 1x,
-                {{ url_for('web.get_cover', book_id=book_id, resolution=2) }} 2x"
-        src="{{ url_for('web.get_cover', book_id=book_id) }}"
+        srcset="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(1)) }} 1x,
+                {{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(2)) }} 2x"
+        src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
         alt="{{ book_title }}"
     />
 {%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 881fa8ff..369b8d05 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -4,8 +4,7 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book.id, book.title) }}
-<!--        <img src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>-->
+        {{ book_cover_image(book, book.title) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index d3615563..cdf6ab2b 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,8 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry.id, entry.title) }}
-<!--          <img src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />-->
+          {{ book_cover_image(entry, entry.title) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 33bafbbe..5d4666f6 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -9,7 +9,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              {{ book_cover_image(entry.id, entry.title) }}
+              {{ book_cover_image(entry, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index bc3ca4a2..67594b4e 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -29,7 +29,7 @@
               <div class="col-sm-3 col-lg-2 col-xs-6 book sortable" {% if entry[0].sort %}data-name="{{entry[0].series[0].name}}"{% endif %} data-id="{% if entry[0].series[0].name %}{{entry[0].series[0].name}}{% endif %}">
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
-                          {{ book_cover_image(entry[0].id, entry[0].name) }}
+                          {{ book_cover_image(entry[0], entry[0].name) }}
                           <span class="badge">{{entry.count}}</span>
                       </a>
                   </div>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index c536884f..531a535c 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -9,7 +9,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              {{ book_cover_image(entry.id, entry.title) }}
+              {{ book_cover_image(entry, entry.title) }}
           </a>
       </div>
       <div class="meta">
@@ -83,7 +83,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              {{ book_cover_image(entry.id, entry.title) }}
+              {{ book_cover_image(entry, entry.title) }}
           </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 56b12154..8e0cf668 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -44,7 +44,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-               {{ book_cover_image(entry.id, entry.title) }}
+               {{ book_cover_image(entry, entry.title) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 7a678ea6..bebc0b1f 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -31,7 +31,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-                {{ book_cover_image(entry.id, entry.title) }}
+                {{ book_cover_image(entry, entry.title) }}
             </a>
       </div>
       <div class="meta">
diff --git a/cps/web.py b/cps/web.py
index 27a5849b..16c14fcf 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,7 +50,7 @@ from . import babel, db, ub, config, get_locale, app
 from . import calibre_db, shelf
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, \
-    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
+    get_cc_columns, get_book_cover, get_cached_book_cover, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password
 from .pagination import Pagination
 from .redirect import redirect_back
@@ -1177,6 +1177,12 @@ def get_cover(book_id, resolution=1):
     return get_book_cover(book_id, resolution)
 
 
+@web.route("/cached-cover/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover(cache_id):
+    return get_cached_book_cover(cache_id)
+
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")

From 242a2767a1e374a938de2f1b3fdb7cb2175c5fd1 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 24 Dec 2020 02:35:32 -0600
Subject: [PATCH 006/220] Added thumbnail urls to book cover srcsets with cache
 busting ids

---
 cps/db.py                     |  3 +-
 cps/helper.py                 | 38 +++++++++++++++
 cps/jinjia.py                 | 16 +++++++
 cps/schedule.py               | 10 ++--
 cps/tasks/thumbnail.py        | 61 ++++++++++++++++++++----
 cps/templates/author.html     |  2 +-
 cps/templates/book_cover.html | 19 +++++---
 cps/templates/book_edit.html  |  2 +-
 cps/templates/detail.html     |  2 +-
 cps/templates/discover.html   |  2 +-
 cps/templates/grid.html       |  2 +-
 cps/templates/index.html      |  4 +-
 cps/templates/search.html     |  2 +-
 cps/templates/shelf.html      |  2 +-
 cps/web.py                    | 89 +++++++++++++++++++++++++----------
 15 files changed, 199 insertions(+), 55 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 2e428f72..8b8db10a 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -609,7 +609,8 @@ class CalibreDB():
             randm = self.session.query(Books) \
                 .filter(self.common_filters(allow_show_archived)) \
                 .order_by(func.random()) \
-                .limit(self.config.config_random_books)
+                .limit(self.config.config_random_books) \
+                .all()
         else:
             randm = false()
         off = int(int(pagesize) * (page - 1))
diff --git a/cps/helper.py b/cps/helper.py
index 0b0c675f..c33a69e1 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -533,6 +533,21 @@ def delete_book(book, calibrepath, book_format):
         return delete_book_file(book, calibrepath, book_format)
 
 
+def get_thumbnails_for_books(books):
+    books_with_covers = list(filter(lambda b: b.has_cover, books))
+    book_ids = list(map(lambda b: b.id, books_with_covers))
+    return ub.session\
+        .query(ub.Thumbnail)\
+        .filter(ub.Thumbnail.book_id.in_(book_ids))\
+        .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+        .all()
+
+
+def get_thumbnails_for_book_series(series):
+    books = list(map(lambda s: s[0], series))
+    return get_thumbnails_for_books(books)
+
+
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
         return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
@@ -558,6 +573,29 @@ def get_cached_book_cover(cache_id):
     return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
+def get_cached_book_cover_thumbnail(cache_id):
+    parts = cache_id.split('_')
+    thumbnail_uuid = parts[0] if len(parts) else None
+    thumbnail = None
+    if thumbnail_uuid:
+        thumbnail = ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.uuid == thumbnail_uuid)\
+            .first()
+
+    if thumbnail and thumbnail.expiration > datetime.utcnow():
+        cache = fs.FileSystem()
+        if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+            return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+
+    elif thumbnail:
+        book = calibre_db.get_book(thumbnail.book_id)
+        return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+
+    else:
+        return get_cover_on_failure(True)
+
+
 def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
 
diff --git a/cps/jinjia.py b/cps/jinjia.py
index bf81c059..b2479adc 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -139,3 +139,19 @@ def book_cover_cache_id(book, resolution=None):
     timestamp = int(book.last_modified.timestamp() * 1000)
     cache_bust = str(book.uuid) + '_' + str(timestamp)
     return cache_bust if not resolution else cache_bust + '_' + str(resolution)
+
+
+@jinjia.app_template_filter('get_book_thumbnails')
+def get_book_thumbnails(book_id, thumbnails=None):
+    return list(filter(lambda t: t.book_id == book_id, thumbnails)) if book_id > -1 and thumbnails else list()
+
+
+@jinjia.app_template_filter('get_book_thumbnail_srcset')
+def get_book_thumbnail_srcset(thumbnails):
+    srcset = list()
+    for thumbnail in thumbnails:
+        timestamp = int(thumbnail.generated_at.timestamp() * 1000)
+        cache_id = str(thumbnail.uuid) + '_' + str(timestamp)
+        url = url_for('web.get_cached_cover_thumbnail', cache_id=cache_id)
+        srcset.append(url + ' ' + str(thumbnail.resolution) + 'x')
+    return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
index f349a231..7ee43410 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -20,17 +20,17 @@ from __future__ import division, print_function, unicode_literals
 
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskCleanupCoverThumbnailCache, TaskGenerateCoverThumbnails
+from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
 
 
 def register_jobs():
     scheduler = BackgroundScheduler()
 
     # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='interval', minutes=5)
+    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='cron', minute='*/5')
 
-    # Cleanup book cover cache every day at 4am
-    scheduler.add_task(user=None, task=lambda: TaskCleanupCoverThumbnailCache(), trigger='cron', hour=4)
+    # Cleanup book cover cache every 6 hours
+    scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
 
     # Reconnect metadata.db every 4 hours
-    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=4)
+    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', minute='5', hour='*/4')
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index b541bc70..e9df170e 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -59,6 +59,10 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
 
             count = len(books_without_thumbnails)
+            if count == 0:
+                # Do not display this task on the frontend if there are no covers to update
+                self.self_cleanup = True
+
             for i, book in enumerate(books_without_thumbnails):
                 for resolution in self.resolutions:
                     expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
@@ -71,6 +75,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     else:
                         self.create_book_thumbnail(book, resolution)
 
+                self.message(u'Generating cover thumbnail {0} of {1}'.format(i, count))
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()
@@ -181,12 +186,12 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return "GenerateCoverThumbnails"
+        return "ThumbnailsGenerate"
 
 
-class TaskCleanupCoverThumbnailCache(CalibreTask):
-    def __init__(self, task_message=u'Cleaning up cover thumbnail cache'):
-        super(TaskCleanupCoverThumbnailCache, self).__init__(task_message)
+class TaskSyncCoverThumbnailCache(CalibreTask):
+    def __init__(self, task_message=u'Syncing cover thumbnail cache'):
+        super(TaskSyncCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
@@ -199,14 +204,23 @@ class TaskCleanupCoverThumbnailCache(CalibreTask):
         # This case will happen if a user deletes the cache dir or cached files
         if self.app_db_session:
             self.expire_missing_thumbnails(cached_thumbnail_files)
-            self.progress = 0.33
+            self.progress = 0.25
 
         # Delete thumbnails in the database if the book has been removed
         # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
         if self.app_db_session and self.calibre_db:
             book_ids = self.get_book_ids()
             self.delete_thumbnails_for_missing_books(book_ids)
-            self.progress = 0.66
+            self.progress = 0.50
+
+        # Expire thumbnails in the database if their corresponding book has been updated since they were generated
+        # This case will happen if the book was updated externally
+        if self.app_db_session and self.cache:
+            books = self.get_books_updated_in_the_last_day()
+            book_ids = list(map(lambda b: b.id, books))
+            thumbnails = self.get_thumbnails_for_updated_books(book_ids)
+            self.expire_thumbnails_for_updated_book(books, thumbnails)
+            self.progress = 0.75
 
         # Delete extraneous cached thumbnail files
         # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
@@ -261,9 +275,40 @@ class TaskCleanupCoverThumbnailCache(CalibreTask):
         for file in extraneous_files:
             self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
 
+    def get_books_updated_in_the_last_day(self):
+        return self.calibre_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.last_modified > datetime.utcnow() - timedelta(days=1, hours=1))\
+            .all()
+
+    def get_thumbnails_for_updated_books(self, book_ids):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id.in_(book_ids))\
+            .all()
+
+    def expire_thumbnails_for_updated_book(self, books, thumbnails):
+        thumbnail_ids = list()
+        for book in books:
+            for thumbnail in thumbnails:
+                if thumbnail.book_id == book.id and thumbnail.generated_at < book.last_modified:
+                    thumbnail_ids.append(thumbnail.id)
+
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.id.in_(thumbnail_ids)) \
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self.app_db_session.rollback()
+
     @property
     def name(self):
-        return "CleanupCoverThumbnailCache"
+        return "ThumbnailsSync"
 
 
 class TaskClearCoverThumbnailCache(CalibreTask):
@@ -318,4 +363,4 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     @property
     def name(self):
-        return "ClearCoverThumbnailCache"
+        return "ThumbnailsClear"
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 3cf3fb4b..e5acdd2f 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -36,7 +36,7 @@
     <div id="books" class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-            {{ book_cover_image(entry, entry.title) }}
+            {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
         </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 3f0ed154..c5281797 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,8 +1,13 @@
-{% macro book_cover_image(book, book_title) -%}
-    <img
-        srcset="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(1)) }} 1x,
-                {{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id(2)) }} 2x"
-        src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
-        alt="{{ book_title }}"
-    />
+{% macro book_cover_image(book, thumbnails) -%}
+    {%- set book_title = book.title if book.title else book.name -%}
+    {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
+    {%- if srcset|length -%}
+        <img
+            srcset="{{ srcset }}"
+            src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
+            alt="{{ book_title }}"
+        />
+    {%- else -%}
+        <img src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}" alt="{{ book_title }}" />
+    {%- endif -%}
 {%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 369b8d05..c538d5ca 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -4,7 +4,7 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book, book.title) }}
+        {{ book_cover_image(book, book.id|get_book_thumbnails(thumbnails)) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index cdf6ab2b..671186c7 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry, entry.title) }}
+          {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 5d4666f6..c5c12db2 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -9,7 +9,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              {{ book_cover_image(entry, entry.title) }}
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 67594b4e..0f669d51 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -29,7 +29,7 @@
               <div class="col-sm-3 col-lg-2 col-xs-6 book sortable" {% if entry[0].sort %}data-name="{{entry[0].series[0].name}}"{% endif %} data-id="{% if entry[0].series[0].name %}{{entry[0].series[0].name}}{% endif %}">
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
-                          {{ book_cover_image(entry[0], entry[0].name) }}
+                          {{ book_cover_image(entry[0], entry[0].id|get_book_thumbnails(thumbnails)) }}
                           <span class="badge">{{entry.count}}</span>
                       </a>
                   </div>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 531a535c..2be15ba7 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -9,7 +9,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              {{ book_cover_image(entry, entry.title) }}
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
       </div>
       <div class="meta">
@@ -83,7 +83,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books">
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-              {{ book_cover_image(entry, entry.title) }}
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
       </div>
       <div class="meta">
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 8e0cf668..a5871afb 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -44,7 +44,7 @@
       <div class="cover">
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-               {{ book_cover_image(entry, entry.title) }}
+               {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
           </a>
         {% endif %}
       </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index bebc0b1f..cb55c50c 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -31,7 +31,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
-                {{ book_cover_image(entry, entry.title) }}
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
             </a>
       </div>
       <div class="meta">
diff --git a/cps/web.py b/cps/web.py
index 16c14fcf..c400b96e 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -49,9 +49,10 @@ from . import constants, logger, isoLanguages, services
 from . import babel, db, ub, config, get_locale, app
 from . import calibre_db, shelf
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import check_valid_domain, render_task_status, \
-    get_cc_columns, get_book_cover, get_cached_book_cover, get_download_link, send_mail, generate_random_password, \
-    send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password
+from .helper import check_valid_domain, render_task_status, get_cc_columns, get_book_cover, get_cached_book_cover, \
+    get_cached_book_cover_thumbnail, get_thumbnails_for_books, get_thumbnails_for_book_series, get_download_link, \
+    send_mail, generate_random_password, send_registration_mail, check_send_to_kindle, check_read_formats, \
+    tags_filters, reset_password
 from .pagination import Pagination
 from .redirect import redirect_back
 from .usermanagement import login_required_if_no_ano
@@ -386,16 +387,18 @@ def render_books_list(data, sort, book_id, page):
                                                                     db.Books,
                                                                     db.Books.ratings.any(db.Ratings.rating > 9),
                                                                     order)
+            thumbnails = get_thumbnails_for_books(entries + random)
             return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                         id=book_id, title=_(u"Top Rated Books"), page="rated")
+                                         id=book_id, title=_(u"Top Rated Books"), page="rated", thumbnails=thumbnails)
         else:
             abort(404)
     elif data == "discover":
         if current_user.check_visibility(constants.SIDEBAR_RANDOM):
             entries, __, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, [func.randomblob(2)])
             pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
+            thumbnails = get_thumbnails_for_books(entries)
             return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
-                                         title=_(u"Discover (Random Books)"), page="discover")
+                                         title=_(u"Discover (Random Books)"), page="discover", thumbnails=thumbnails)
         else:
             abort(404)
     elif data == "unread":
@@ -433,8 +436,9 @@ def render_books_list(data, sort, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Books"), page=website)
+                                     title=_(u"Books"), page=website, thumbnails=thumbnails)
 
 
 def render_hot_books(page):
@@ -458,8 +462,9 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -490,12 +495,14 @@ def render_downloaded_books(page, order):
                              .filter(db.Books.id == book.id).first():
                 ub.delete_download(book.id)
 
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
                                      pagination=pagination,
                                      title=_(u"Downloaded books by %(user)s",user=current_user.nickname),
-                                     page="download")
+                                     page="download",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -521,9 +528,10 @@ def render_author_books(page, author_id, order):
         author_info = services.goodreads_support.get_author_info(author_name)
         other_books = services.goodreads_support.get_other_books(author_info, entries)
 
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
-                                 other_books=other_books, page="author")
+                                 other_books=other_books, page="author", thumbnails=thumbnails)
 
 
 def render_publisher_books(page, book_id, order):
@@ -535,8 +543,10 @@ def render_publisher_books(page, book_id, order):
                                                                 [db.Series.name, order[0], db.Books.series_index],
                                                                 db.books_series_link,
                                                                 db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher")
+                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -548,8 +558,10 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Series: %(serie)s", serie=name.name), page="series")
+                                     title=_(u"Series: %(serie)s", serie=name.name), page="series",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -561,8 +573,10 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings")
+                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -574,8 +588,10 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"File format: %(format)s", format=name.format), page="formats")
+                                     title=_(u"File format: %(format)s", format=name.format), page="formats",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -588,8 +604,10 @@ def render_category_books(page, book_id, order):
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0], db.Series.name, db.Books.series_index],
                                                                 db.books_series_link, db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category")
+                                     title=_(u"Category: %(name)s", name=name.name), page="category",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -607,8 +625,9 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
-                                 title=_(u"Language: %(name)s", name=lang_name), page="language")
+                                 title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
@@ -652,8 +671,10 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
+
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename)
+                                     title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_archived_books(page, order):
@@ -676,8 +697,9 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename)
+                                 title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_prepare_search_form(cc):
@@ -710,6 +732,7 @@ def render_prepare_search_form(cc):
 
 def render_search_results(term, offset=None, order=None, limit=None):
     entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  searchterm=term,
                                  pagination=pagination,
@@ -718,7 +741,8 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                  entries=entries,
                                  result_count=result_count,
                                  title=_(u"Search"),
-                                 page="search")
+                                 page="search",
+                                 thumbnails=thumbnails)
 
 
 # ################################### View Books list ##################################################################
@@ -748,6 +772,7 @@ def books_table():
     return render_title_template('book_table.html', title=_(u"Books List"), page="book_table",
                                  visiblility=visibility)
 
+
 @web.route("/ajax/listbooks")
 @login_required
 def list_books():
@@ -780,6 +805,7 @@ def list_books():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @web.route("/ajax/table_settings", methods=['POST'])
 @login_required
 def update_table_settings():
@@ -834,6 +860,7 @@ def publisher_list():
         charlist = calibre_db.session.query(func.upper(func.substr(db.Publishers.name, 1, 1)).label('char')) \
             .join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(func.upper(func.substr(db.Publishers.name, 1, 1))).all()
+
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher")
     else:
@@ -865,8 +892,10 @@ def series_list():
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
                 .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
 
+            thumbnails = get_thumbnails_for_book_series(entries)
             return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view")
+                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
+                                         thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -1150,13 +1179,16 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
+
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
                                  entries=q[offset:limit_all],
                                  result_count=result_count,
-                                 title=_(u"Advanced Search"), page="advsearch")
-
+                                 title=_(u"Advanced Search"),
+                                 page="advsearch",
+                                 thumbnails=thumbnails)
 
 
 @web.route("/advsearch", methods=['GET'])
@@ -1171,10 +1203,9 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
-@web.route("/cover/<int:book_id>/<int:resolution>")
 @login_required_if_no_ano
-def get_cover(book_id, resolution=1):
-    return get_book_cover(book_id, resolution)
+def get_cover(book_id):
+    return get_book_cover(book_id)
 
 
 @web.route("/cached-cover/<string:cache_id>")
@@ -1183,6 +1214,12 @@ def get_cached_cover(cache_id):
     return get_cached_book_cover(cache_id)
 
 
+@web.route("/cached-cover-thumbnail/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover_thumbnail(cache_id):
+    return get_cached_book_cover_thumbnail(cache_id)
+
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
@@ -1591,6 +1628,7 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
+        thumbnails = get_thumbnails_for_books([entries])
         return render_title_template('detail.html',
                                      entry=entries,
                                      audioentries=audioentries,
@@ -1602,7 +1640,8 @@ def show_book(book_id):
                                      is_archived=is_archived,
                                      kindle_list=kindle_list,
                                      reader_list=reader_list,
-                                     page="book")
+                                     page="book",
+                                     thumbnails=thumbnails)
     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 eef21759cd56c28560ee2007726fab18c8595df5 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 24 Dec 2020 03:00:26 -0600
Subject: [PATCH 007/220] Fix generate thumbnail task messages, don't load
 thumbnails when the cache file has been deleted

---
 cps/helper.py          | 4 ++++
 cps/tasks/thumbnail.py | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cps/helper.py b/cps/helper.py
index c33a69e1..add1b067 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -536,9 +536,13 @@ def delete_book(book, calibrepath, book_format):
 def get_thumbnails_for_books(books):
     books_with_covers = list(filter(lambda b: b.has_cover, books))
     book_ids = list(map(lambda b: b.id, books_with_covers))
+    cache = fs.FileSystem()
+    thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
     return ub.session\
         .query(ub.Thumbnail)\
         .filter(ub.Thumbnail.book_id.in_(book_ids))\
+        .filter(ub.Thumbnail.filename.in_(thumbnail_files))\
         .filter(ub.Thumbnail.expiration > datetime.utcnow())\
         .all()
 
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index e9df170e..70ddc06b 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -75,7 +75,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     else:
                         self.create_book_thumbnail(book, resolution)
 
-                self.message(u'Generating cover thumbnail {0} of {1}'.format(i, count))
+                self.message = u'Generating cover thumbnail {0} of {1}'.format(i + 1, count)
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()

From 8cc06683df25684793d1d6154a74a3b11408d980 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Mon, 4 Jan 2021 12:28:05 -0600
Subject: [PATCH 008/220] only python3 supported now

---
 cps/tasks/database.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 11f0186d..62208c0c 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -20,11 +20,7 @@ from __future__ import division, print_function, unicode_literals
 
 from cps import config, logger
 from cps.services.worker import CalibreTask
-
-try:
-    from urllib.request import urlopen
-except ImportError as e:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 
 
 class TaskReconnectDatabase(CalibreTask):

From 2c8d055ca4e9b92842615516834bb2472348b15e Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Mon, 4 Jan 2021 12:36:40 -0600
Subject: [PATCH 009/220] support python2.7 for the mean time

---
 cps/tasks/database.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 62208c0c..11f0186d 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -20,7 +20,11 @@ from __future__ import division, print_function, unicode_literals
 
 from cps import config, logger
 from cps.services.worker import CalibreTask
-from urllib.request import urlopen
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
 
 
 class TaskReconnectDatabase(CalibreTask):

From dd30ac4fbdc9699dc4462b1a9a7efeddb53ffe3a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 20 Mar 2021 11:32:50 +0100
Subject: [PATCH 010/220] Added thumbnails Merge remote-tracking branch
 'cover/thumbnails' into development

# Conflicts:
#	cps/admin.py
#	cps/templates/layout.html
#	cps/ub.py
#	cps/web.py
Update join for sqlalchemy 1.4
---
 .gitignore                           |   1 +
 cps.py                               |   5 +
 cps/__init__.py                      |   3 +-
 cps/admin.py                         |  19 +-
 cps/constants.py                     |   1 +
 cps/db.py                            |  13 +-
 cps/editbooks.py                     |   2 +
 cps/fs.py                            |  61 +++++
 cps/helper.py                        |  89 ++++++-
 cps/jinjia.py                        |  22 ++
 cps/schedule.py                      |  36 +++
 cps/services/background_scheduler.py |  52 ++++
 cps/services/worker.py               |  17 +-
 cps/shelf.py                         |   2 +-
 cps/static/css/caliBlur.css          |  82 ++++--
 cps/static/js/main.js                |  12 +
 cps/tasks/database.py                |  49 ++++
 cps/tasks/thumbnail.py               | 366 +++++++++++++++++++++++++++
 cps/templates/admin.html             |  36 ++-
 cps/templates/author.html            |   2 +-
 cps/templates/book_cover.html        |  13 +
 cps/templates/book_edit.html         |   3 +-
 cps/templates/detail.html            |   2 +-
 cps/templates/discover.html          |   3 +-
 cps/templates/fragment.html          |   1 +
 cps/templates/grid.html              |   3 +-
 cps/templates/index.html             |   5 +-
 cps/templates/layout.html            |   1 +
 cps/templates/search.html            |   3 +-
 cps/templates/shelf.html             |   3 +-
 cps/ub.py                            |  34 +++
 cps/web.py                           |  96 +++++--
 requirements.txt                     |   1 +
 33 files changed, 965 insertions(+), 73 deletions(-)
 create mode 100644 cps/fs.py
 create mode 100644 cps/schedule.py
 create mode 100644 cps/services/background_scheduler.py
 create mode 100644 cps/tasks/database.py
 create mode 100644 cps/tasks/thumbnail.py
 create mode 100644 cps/templates/book_cover.html

diff --git a/.gitignore b/.gitignore
index 109de4ef..903cfd36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ vendor/
 # calibre-web
 *.db
 *.log
+cps/cache
 
 .idea/
 *.bak
diff --git a/cps.py b/cps.py
index 737b0d97..19ca89b8 100755
--- a/cps.py
+++ b/cps.py
@@ -43,6 +43,7 @@ from cps.gdrive import gdrive
 from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.error_handler import init_errorhandler
+from cps.schedule import register_jobs
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -78,6 +79,10 @@ def main():
         app.register_blueprint(kobo_auth)
     if oauth_available:
         app.register_blueprint(oauth)
+
+    # Register scheduled jobs
+    register_jobs()
+
     success = web_server.start()
     sys.exit(0 if success else 1)
 
diff --git a/cps/__init__.py b/cps/__init__.py
index 627cca0b..30029428 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -96,7 +96,7 @@ def create_app():
         app.instance_path = app.instance_path.decode('utf-8')
 
     if os.environ.get('FLASK_DEBUG'):
-    	cache_buster.init_cache_busting(app)
+        cache_buster.init_cache_busting(app)
 
     log.info('Starting Calibre Web...')
     if sys.version_info < (3, 0):
@@ -121,6 +121,7 @@ def create_app():
 
     return app
 
+
 @babel.localeselector
 def get_locale():
     # if a user is logged in, use the locale from the user settings
diff --git a/cps/admin.py b/cps/admin.py
index 78cfebf1..cd548bfb 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -40,7 +40,7 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_
 
-from . import constants, logger, helper, services, isoLanguages
+from . import constants, logger, helper, services, isoLanguages, fs
 from .cli import filepicker
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash
@@ -164,6 +164,23 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
+@admi.route("/clear-cache")
+@login_required
+@admin_required
+def clear_cache():
+    cache_type = request.args.get('cache_type'.strip())
+    showtext = {}
+
+    if cache_type == fs.CACHE_TYPE_THUMBNAILS:
+        log.info('clearing cover thumbnail cache')
+        showtext['text'] = _(u'Cleared cover thumbnail cache')
+        helper.clear_cover_thumbnail_cache()
+        return json.dumps(showtext)
+
+    showtext['text'] = _(u'Unknown command')
+    return json.dumps(showtext)
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
diff --git a/cps/constants.py b/cps/constants.py
index e9c26cb1..0eb94709 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -37,6 +37,7 @@ else:
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
+CACHE_DIR           = os.path.join(BASE_DIR, 'cps', 'cache')
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/db.py b/cps/db.py
index ac59ac2b..f43cc811 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -620,15 +620,18 @@ class CalibreDB():
             randm = self.session.query(Books) \
                 .filter(self.common_filters(allow_show_archived)) \
                 .order_by(func.random()) \
-                .limit(self.config.config_random_books)
+                .limit(self.config.config_random_books) \
+                .all()
         else:
             randm = false()
         off = int(int(pagesize) * (page - 1))
-        query = self.session.query(database) \
-            .filter(db_filter) \
+        query = self.session.query(database)
+        if len(join) == 3:
+            query = query.join(join[0], join[1]).join(join[2], isouter=True)
+        elif len(join) == 2:
+            query = query.join(join[0], join[1], isouter=True)
+        query = query.filter(db_filter)\
             .filter(self.common_filters(allow_show_archived))
-        if len(join):
-            query = query.join(*join, isouter=True)
         entries = list()
         pagination = list()
         try:
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 28cad5c5..b7f496d0 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -614,6 +614,7 @@ def upload_cover(request, book):
                 abort(403)
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
+                helper.clear_cover_thumbnail_cache(book.id)
                 return True
             else:
                 flash(message, category="error")
@@ -710,6 +711,7 @@ def edit_book(book_id):
                         if result is True:
                             book.has_cover = 1
                             modif_date = True
+                            helper.clear_cover_thumbnail_cache(book.id)
                         else:
                             flash(error, category="error")
 
diff --git a/cps/fs.py b/cps/fs.py
new file mode 100644
index 00000000..699d5991
--- /dev/null
+++ b/cps/fs.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+from .constants import CACHE_DIR
+from os import listdir, makedirs, remove
+from os.path import isdir, isfile, join
+from shutil import rmtree
+
+CACHE_TYPE_THUMBNAILS = 'thumbnails'
+
+
+class FileSystem:
+    _instance = None
+    _cache_dir = CACHE_DIR
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(FileSystem, cls).__new__(cls)
+        return cls._instance
+
+    def get_cache_dir(self, cache_type=None):
+        if not isdir(self._cache_dir):
+            makedirs(self._cache_dir)
+
+        if cache_type and not isdir(join(self._cache_dir, cache_type)):
+            makedirs(join(self._cache_dir, cache_type))
+
+        return join(self._cache_dir, cache_type) if cache_type else self._cache_dir
+
+    def get_cache_file_path(self, filename, cache_type=None):
+        return join(self.get_cache_dir(cache_type), filename) if filename else None
+
+    def list_cache_files(self, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file))]
+
+    def delete_cache_dir(self, cache_type=None):
+        if not cache_type and isdir(self._cache_dir):
+            rmtree(self._cache_dir)
+        if cache_type and isdir(join(self._cache_dir, cache_type)):
+            rmtree(join(self._cache_dir, cache_type))
+
+    def delete_cache_file(self, filename, cache_type=None):
+        if isfile(join(self.get_cache_dir(cache_type), filename)):
+            remove(join(self.get_cache_dir(cache_type), filename))
diff --git a/cps/helper.py b/cps/helper.py
index e18ae33b..e3c79dea 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -52,12 +52,13 @@ except ImportError:
 
 from . import calibre_db
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub
+from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
 from .tasks.mail import TaskEmail
+from .tasks.thumbnail import TaskClearCoverThumbnailCache
 
 log = logger.create()
 
@@ -514,12 +515,32 @@ def update_dir_stucture(book_id, calibrepath, first_author=None, orignal_filepat
 
 
 def delete_book(book, calibrepath, book_format):
+    clear_cover_thumbnail_cache(book.id)
     if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
         return delete_book_file(book, calibrepath, book_format)
 
 
+def get_thumbnails_for_books(books):
+    books_with_covers = list(filter(lambda b: b.has_cover, books))
+    book_ids = list(map(lambda b: b.id, books_with_covers))
+    cache = fs.FileSystem()
+    thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
+    return ub.session\
+        .query(ub.Thumbnail)\
+        .filter(ub.Thumbnail.book_id.in_(book_ids))\
+        .filter(ub.Thumbnail.filename.in_(thumbnail_files))\
+        .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+        .all()
+
+
+def get_thumbnails_for_book_series(series):
+    books = list(map(lambda s: s[0], series))
+    return get_thumbnails_for_books(books)
+
+
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
         return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
@@ -532,14 +553,54 @@ def get_book_cover(book_id):
     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):
+def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     book = calibre_db.get_book_by_uuid(book_uuid)
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_book_cover_internal(book, use_generic_cover_on_failure):
+def get_cached_book_cover(cache_id):
+    parts = cache_id.split('_')
+    book_uuid = parts[0] if len(parts) else None
+    resolution = parts[2] if len(parts) > 2 else None
+    book = calibre_db.get_book_by_uuid(book_uuid) if book_uuid else None
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+
+
+def get_cached_book_cover_thumbnail(cache_id):
+    parts = cache_id.split('_')
+    thumbnail_uuid = parts[0] if len(parts) else None
+    thumbnail = None
+    if thumbnail_uuid:
+        thumbnail = ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.uuid == thumbnail_uuid)\
+            .first()
+
+    if thumbnail and thumbnail.expiration > datetime.utcnow():
+        cache = fs.FileSystem()
+        if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+            return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+
+    elif thumbnail:
+        book = calibre_db.get_book(thumbnail.book_id)
+        return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+
+    else:
+        return get_cover_on_failure(True)
+
+
+def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
+
+        # Send the book cover thumbnail if it exists in cache
+        if resolution:
+            thumbnail = get_book_cover_thumbnail(book, resolution)
+            if thumbnail:
+                cache = fs.FileSystem()
+                if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                    return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+
+        # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
             try:
                 if not gd.is_gdrive_ready():
@@ -550,9 +611,11 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                 else:
                     log.error('%s/cover.jpg not found on Google Drive', book.path)
                     return get_cover_on_failure(use_generic_cover_on_failure)
-            except Exception as e:
-                log.debug_or_exception(e)
+            except Exception as ex:
+                log.debug_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
+
+        # Send the book cover from the Calibre directory
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
             if os.path.isfile(os.path.join(cover_file_path, "cover.jpg")):
@@ -563,6 +626,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
         return get_cover_on_failure(use_generic_cover_on_failure)
 
 
+def get_book_cover_thumbnail(book, resolution):
+    if book and book.has_cover:
+        return ub.session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book.id)\
+            .filter(ub.Thumbnail.resolution == resolution)\
+            .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+            .first()
+
+
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
@@ -820,3 +893,7 @@ def get_download_link(book_id, book_format, client):
         return do_download_file(book, book_format, client, data1, headers)
     else:
         abort(404)
+
+
+def clear_cover_thumbnail_cache(book_id=None):
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 688d1fba..b2479adc 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -128,8 +128,30 @@ def formatseriesindex_filter(series_index):
             return series_index
     return 0
 
+
 @jinjia.app_template_filter('uuidfilter')
 def uuidfilter(var):
     return uuid4()
 
 
+@jinjia.app_template_filter('book_cover_cache_id')
+def book_cover_cache_id(book, resolution=None):
+    timestamp = int(book.last_modified.timestamp() * 1000)
+    cache_bust = str(book.uuid) + '_' + str(timestamp)
+    return cache_bust if not resolution else cache_bust + '_' + str(resolution)
+
+
+@jinjia.app_template_filter('get_book_thumbnails')
+def get_book_thumbnails(book_id, thumbnails=None):
+    return list(filter(lambda t: t.book_id == book_id, thumbnails)) if book_id > -1 and thumbnails else list()
+
+
+@jinjia.app_template_filter('get_book_thumbnail_srcset')
+def get_book_thumbnail_srcset(thumbnails):
+    srcset = list()
+    for thumbnail in thumbnails:
+        timestamp = int(thumbnail.generated_at.timestamp() * 1000)
+        cache_id = str(thumbnail.uuid) + '_' + str(timestamp)
+        url = url_for('web.get_cached_cover_thumbnail', cache_id=cache_id)
+        srcset.append(url + ' ' + str(thumbnail.resolution) + 'x')
+    return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
new file mode 100644
index 00000000..7ee43410
--- /dev/null
+++ b/cps/schedule.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+
+from .services.background_scheduler import BackgroundScheduler
+from .tasks.database import TaskReconnectDatabase
+from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
+
+
+def register_jobs():
+    scheduler = BackgroundScheduler()
+
+    # Generate 100 book cover thumbnails every 5 minutes
+    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='cron', minute='*/5')
+
+    # Cleanup book cover cache every 6 hours
+    scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
+
+    # Reconnect metadata.db every 4 hours
+    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', minute='5', hour='*/4')
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
new file mode 100644
index 00000000..efa57379
--- /dev/null
+++ b/cps/services/background_scheduler.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+import atexit
+
+from .. import logger
+from .worker import WorkerThread
+from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+
+
+class BackgroundScheduler:
+    _instance = None
+
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(BackgroundScheduler, cls).__new__(cls)
+
+            scheduler = BScheduler()
+            atexit.register(lambda: scheduler.shutdown())
+
+            cls.log = logger.create()
+            cls.scheduler = scheduler
+            cls.scheduler.start()
+
+        return cls._instance
+
+    def add(self, func, trigger, **trigger_args):
+        self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+
+    def add_task(self, user, task, trigger, **trigger_args):
+        def scheduled_task():
+            worker_task = task()
+            self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+            WorkerThread.add(user, worker_task)
+
+        self.add(func=scheduled_task, trigger=trigger, **trigger_args)
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 072674a0..2b6816db 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -35,7 +35,6 @@ def _get_main_thread():
     raise Exception("main thread not found?!")
 
 
-
 class ImprovedQueue(queue.Queue):
     def to_list(self):
         """
@@ -45,7 +44,8 @@ class ImprovedQueue(queue.Queue):
         with self.mutex:
             return list(self.queue)
 
-#Class for all worker tasks in the background
+
+# Class for all worker tasks in the background
 class WorkerThread(threading.Thread):
     _instance = None
 
@@ -127,6 +127,10 @@ class WorkerThread(threading.Thread):
                 # CalibreTask.start() should wrap all exceptions in it's own error handling
                 item.task.start(self)
 
+            # remove self_cleanup tasks from list
+            if item.task.self_cleanup:
+                self.dequeued.remove(item)
+
             self.queue.task_done()
 
 
@@ -141,6 +145,7 @@ class CalibreTask:
         self.end_time = None
         self.message = message
         self.id = uuid.uuid4()
+        self.self_cleanup = False
 
     @abc.abstractmethod
     def run(self, worker_thread):
@@ -209,6 +214,14 @@ class CalibreTask:
         # todo: throw error if outside of [0,1]
         self._progress = x
 
+    @property
+    def self_cleanup(self):
+        return self._self_cleanup
+
+    @self_cleanup.setter
+    def self_cleanup(self, is_self_cleanup):
+        self._self_cleanup = is_self_cleanup
+
     def _handleError(self, error_message):
         self.stat = STAT_FAIL
         self.progress = 1
diff --git a/cps/shelf.py b/cps/shelf.py
index 5c6037ac..7b00c32b 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -403,7 +403,7 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
                                                             db.Books,
                                                             ub.BookShelf.shelf == shelf_id,
                                                             [ub.BookShelf.order.asc()],
-                                                            ub.BookShelf,ub.BookShelf.book_id == db.Books.id)
+                                                            ub.BookShelf, ub.BookShelf.book_id == db.Books.id)
         # delete chelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web
         wrong_entries = calibre_db.session.query(ub.BookShelf)\
             .join(db.Books, ub.BookShelf.book_id == db.Books.id, isouter=True)\
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index 14e5c286..aa747c0b 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -5148,7 +5148,7 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
     pointer-events: none
 }
 
-#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
+#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #ClearCacheDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
     cursor: pointer
 }
 
@@ -5235,7 +5235,7 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
     margin-bottom: 20px
 }
 
-body.admin:not(.modal-open) .btn-default {
+body.admin .btn-default {
     margin-bottom: 10px
 }
 
@@ -5466,7 +5466,7 @@ body.admin.modal-open .navbar {
     z-index: 0 !important
 }
 
-#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal {
+#RestartDialog, #ShutdownDialog, #StatusDialog, #ClearCacheDialog, #deleteModal {
     top: 0;
     overflow: hidden;
     padding-top: 70px;
@@ -5476,7 +5476,7 @@ body.admin.modal-open .navbar {
     background: rgba(0, 0, 0, .5)
 }
 
-#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before {
+#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #ClearCacheDialog:before, #deleteModal:before {
     content: "\E208";
     padding-right: 10px;
     display: block;
@@ -5498,18 +5498,18 @@ body.admin.modal-open .navbar {
     z-index: 99
 }
 
-#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
     -webkit-transform: translate(0, 0);
     -ms-transform: translate(0, 0);
     transform: translate(0, 0)
 }
 
-#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
     width: 450px;
     margin: auto
 }
 
-#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
     max-height: calc(100% - 90px);
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
@@ -5520,7 +5520,7 @@ body.admin.modal-open .navbar {
     width: 450px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
     padding: 15px 20px;
     border-radius: 3px 3px 0 0;
     line-height: 1.71428571;
@@ -5533,7 +5533,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     padding-right: 10px;
     font-size: 18px;
     color: #999;
@@ -5557,6 +5557,11 @@ body.admin.modal-open .navbar {
     font-family: plex-icons-new, serif
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before {
+    content: "\EA15";
+    font-family: plex-icons-new, serif
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
     font-family: plex-icons-new, serif
@@ -5580,6 +5585,12 @@ body.admin.modal-open .navbar {
     font-size: 20px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:after {
+    content: "Clear Cover Thumbnail Cache";
+    display: inline-block;
+    font-size: 20px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-header:after {
     content: "Delete Book";
     display: inline-block;
@@ -5610,7 +5621,17 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body {
+    padding: 20px 20px 10px;
+    font-size: 16px;
+    line-height: 1.6em;
+    font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif;
+    color: #eee;
+    background: #282828;
+    text-align: left
+}
+
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
     padding: 20px 20px 0 0;
     font-size: 16px;
     line-height: 1.6em;
@@ -5619,7 +5640,7 @@ body.admin.modal-open .navbar {
     background: #282828
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     float: right;
     z-index: 9;
     position: relative;
@@ -5655,6 +5676,18 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > #clear_cache {
+    float: right;
+    z-index: 9;
+    position: relative;
+    margin: 25px 0 0 10px;
+    min-width: 80px;
+    padding: 10px 18px;
+    font-size: 16px;
+    line-height: 1.33;
+    border-radius: 3px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
@@ -5675,11 +5708,15 @@ body.admin.modal-open .navbar {
     margin: 55px 0 0 10px
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache) {
+    margin: 25px 0 0 10px
+}
+
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     margin: 0 0 0 10px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
     background-color: hsla(0, 0%, 100%, .3)
 }
 
@@ -5713,6 +5750,21 @@ body.admin.modal-open .navbar {
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
 }
 
+#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body:after {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 72px;
+    background-color: #323232;
+    border-radius: 0 0 3px 3px;
+    left: 0;
+    margin-top: 10px;
+    z-index: 0;
+    border-top: 1px solid #222;
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+    box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
+}
+
 #deleteButton {
     position: fixed;
     top: 60px;
@@ -7299,11 +7351,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         background-color: transparent !important
     }
 
-    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog {
+    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
         max-width: calc(100vw - 40px)
     }
 
-    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
         max-width: calc(100vw - 40px);
         left: 0
     }
@@ -7453,7 +7505,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         padding: 30px 15px
     }
 
-    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before {
+    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
         left: auto;
         right: 34px
     }
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 834b9b30..51d6095d 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -430,6 +430,18 @@ $(function() {
             }
         });
     });
+    $("#clear_cache").click(function () {
+        $("#spinner3").show();
+        $.ajax({
+            dataType: "json",
+            url: window.location.pathname + "/../../clear-cache",
+            data: {"cache_type":"thumbnails"},
+            success: function(data) {
+                $("#spinner3").hide();
+                $("#ClearCacheDialog").modal("hide");
+            }
+        });
+    });
 
     // Init all data control handlers to default
     $("input[data-control]").trigger("change");
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
new file mode 100644
index 00000000..11f0186d
--- /dev/null
+++ b/cps/tasks/database.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+
+from cps import config, logger
+from cps.services.worker import CalibreTask
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
+
+
+class TaskReconnectDatabase(CalibreTask):
+    def __init__(self, task_message=u'Reconnecting Calibre database'):
+        super(TaskReconnectDatabase, self).__init__(task_message)
+        self.log = logger.create()
+        self.listen_address = config.get_config_ipaddress()
+        self.listen_port = config.config_port
+
+    def run(self, worker_thread):
+        address = self.listen_address if self.listen_address else 'localhost'
+        port = self.listen_port if self.listen_port else 8083
+
+        try:
+            urlopen('http://' + address + ':' + str(port) + '/reconnect')
+            self._handleSuccess()
+        except Exception as ex:
+            self._handleError(u'Unable to reconnect Calibre database: ' + str(ex))
+
+    @property
+    def name(self):
+        return "Reconnect Database"
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
new file mode 100644
index 00000000..70ddc06b
--- /dev/null
+++ b/cps/tasks/thumbnail.py
@@ -0,0 +1,366 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2020 mmonkey
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import division, print_function, unicode_literals
+import os
+
+from cps import config, db, fs, gdriveutils, logger, ub
+from cps.services.worker import CalibreTask
+from datetime import datetime, timedelta
+from sqlalchemy import func
+
+try:
+    from urllib.request import urlopen
+except ImportError as e:
+    from urllib2 import urlopen
+
+try:
+    from wand.image import Image
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    use_IM = False
+
+THUMBNAIL_RESOLUTION_1X = 1
+THUMBNAIL_RESOLUTION_2X = 2
+
+
+class TaskGenerateCoverThumbnails(CalibreTask):
+    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+        super(TaskGenerateCoverThumbnails, self).__init__(task_message)
+        self.limit = limit
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+        self.resolutions = [
+            THUMBNAIL_RESOLUTION_1X,
+            THUMBNAIL_RESOLUTION_2X
+        ]
+
+    def run(self, worker_thread):
+        if self.calibre_db.session and use_IM:
+            expired_thumbnails = self.get_expired_thumbnails()
+            thumbnail_book_ids = self.get_thumbnail_book_ids()
+            books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
+
+            count = len(books_without_thumbnails)
+            if count == 0:
+                # Do not display this task on the frontend if there are no covers to update
+                self.self_cleanup = True
+
+            for i, book in enumerate(books_without_thumbnails):
+                for resolution in self.resolutions:
+                    expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
+                        book,
+                        resolution,
+                        expired_thumbnails
+                    )
+                    if expired_thumbnail:
+                        self.update_book_thumbnail(book, expired_thumbnail)
+                    else:
+                        self.create_book_thumbnail(book, resolution)
+
+                self.message = u'Generating cover thumbnail {0} of {1}'.format(i + 1, count)
+                self.progress = (1.0 / count) * i
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_expired_thumbnails(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.expiration < datetime.utcnow())\
+            .all()
+
+    def get_thumbnail_book_ids(self):
+        return self.app_db_session\
+            .query(ub.Thumbnail.book_id)\
+            .group_by(ub.Thumbnail.book_id)\
+            .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
+            .distinct()
+
+    def get_books_without_thumbnails(self, thumbnail_book_ids):
+        return self.calibre_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.id.notin_(thumbnail_book_ids))\
+            .limit(self.limit)\
+            .all()
+
+    def get_expired_thumbnail_for_book_and_resolution(self, book, resolution, expired_thumbnails):
+        for thumbnail in expired_thumbnails:
+            if thumbnail.book_id == book.id and thumbnail.resolution == resolution:
+                return thumbnail
+
+        return None
+
+    def update_book_thumbnail(self, book, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
+        thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
+
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def create_book_thumbnail(self, book, resolution):
+        thumbnail = ub.Thumbnail()
+        thumbnail.book_id = book.id
+        thumbnail.format = 'jpeg'
+        thumbnail.resolution = resolution
+
+        self.app_db_session.add(thumbnail)
+        try:
+            self.app_db_session.commit()
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error creating book thumbnail: ' + str(ex))
+            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def generate_book_thumbnail(self, book, thumbnail):
+        if book and thumbnail:
+            if config.config_use_google_drive:
+                if not gdriveutils.is_gdrive_ready():
+                    raise Exception('Google Drive is configured but not ready')
+
+                web_content_link = gdriveutils.get_cover_via_gdrive(book.path)
+                if not web_content_link:
+                    raise Exception('Google Drive cover url not found')
+
+                stream = None
+                try:
+                    stream = urlopen(web_content_link)
+                    with Image(file=stream) as img:
+                        height = self.get_thumbnail_height(thumbnail)
+                        if img.height > height:
+                            width = self.get_thumbnail_width(height, img)
+                            img.resize(width=width, height=height, filter='lanczos')
+                            img.format = thumbnail.format
+                            filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                            img.save(filename=filename)
+                except Exception as ex:
+                    # Bubble exception to calling function
+                    self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                    raise ex
+                finally:
+                    stream.close()
+            else:
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if not os.path.isfile(book_cover_filepath):
+                    raise Exception('Book cover file not found')
+
+                with Image(filename=book_cover_filepath) as img:
+                    height = self.get_thumbnail_height(thumbnail)
+                    if img.height > height:
+                        width = self.get_thumbnail_width(height, img)
+                        img.resize(width=width, height=height, filter='lanczos')
+                        img.format = thumbnail.format
+                        filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                        img.save(filename=filename)
+
+    def get_thumbnail_height(self, thumbnail):
+        return int(225 * thumbnail.resolution)
+
+    def get_thumbnail_width(self, height, img):
+        percent = (height / float(img.height))
+        return int((float(img.width) * float(percent)))
+
+    @property
+    def name(self):
+        return "ThumbnailsGenerate"
+
+
+class TaskSyncCoverThumbnailCache(CalibreTask):
+    def __init__(self, task_message=u'Syncing cover thumbnail cache'):
+        super(TaskSyncCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+
+    def run(self, worker_thread):
+        cached_thumbnail_files = self.cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
+
+        # Expire thumbnails in the database if the cached file is missing
+        # This case will happen if a user deletes the cache dir or cached files
+        if self.app_db_session:
+            self.expire_missing_thumbnails(cached_thumbnail_files)
+            self.progress = 0.25
+
+        # Delete thumbnails in the database if the book has been removed
+        # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
+        if self.app_db_session and self.calibre_db:
+            book_ids = self.get_book_ids()
+            self.delete_thumbnails_for_missing_books(book_ids)
+            self.progress = 0.50
+
+        # Expire thumbnails in the database if their corresponding book has been updated since they were generated
+        # This case will happen if the book was updated externally
+        if self.app_db_session and self.cache:
+            books = self.get_books_updated_in_the_last_day()
+            book_ids = list(map(lambda b: b.id, books))
+            thumbnails = self.get_thumbnails_for_updated_books(book_ids)
+            self.expire_thumbnails_for_updated_book(books, thumbnails)
+            self.progress = 0.75
+
+        # Delete extraneous cached thumbnail files
+        # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
+        if self.app_db_session:
+            db_thumbnail_files = self.get_thumbnail_filenames()
+            self.delete_extraneous_thumbnail_files(cached_thumbnail_files, db_thumbnail_files)
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def expire_missing_thumbnails(self, filenames):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.filename.notin_(filenames))\
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for missing cache files: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_book_ids(self):
+        results = self.calibre_db.session\
+            .query(db.Books.id)\
+            .filter(db.Books.has_cover == 1)\
+            .distinct()
+
+        return [value for value, in results]
+
+    def delete_thumbnails_for_missing_books(self, book_ids):
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.book_id.notin_(book_ids))\
+                .delete(synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(str(ex))
+            self._handleError(u'Error deleting thumbnails for missing books: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def get_thumbnail_filenames(self):
+        results = self.app_db_session\
+            .query(ub.Thumbnail.filename)\
+            .all()
+
+        return [thumbnail for thumbnail, in results]
+
+    def delete_extraneous_thumbnail_files(self, cached_thumbnail_files, db_thumbnail_files):
+        extraneous_files = list(set(cached_thumbnail_files).difference(db_thumbnail_files))
+        for file in extraneous_files:
+            self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
+
+    def get_books_updated_in_the_last_day(self):
+        return self.calibre_db.session\
+            .query(db.Books)\
+            .filter(db.Books.has_cover == 1)\
+            .filter(db.Books.last_modified > datetime.utcnow() - timedelta(days=1, hours=1))\
+            .all()
+
+    def get_thumbnails_for_updated_books(self, book_ids):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id.in_(book_ids))\
+            .all()
+
+    def expire_thumbnails_for_updated_book(self, books, thumbnails):
+        thumbnail_ids = list()
+        for book in books:
+            for thumbnail in thumbnails:
+                if thumbnail.book_id == book.id and thumbnail.generated_at < book.last_modified:
+                    thumbnail_ids.append(thumbnail.id)
+
+        try:
+            self.app_db_session\
+                .query(ub.Thumbnail)\
+                .filter(ub.Thumbnail.id.in_(thumbnail_ids)) \
+                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
+            self.app_db_session.commit()
+        except Exception as ex:
+            self.log.info(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self._handleError(u'Error expiring thumbnails for updated books: ' + str(ex))
+            self.app_db_session.rollback()
+
+    @property
+    def name(self):
+        return "ThumbnailsSync"
+
+
+class TaskClearCoverThumbnailCache(CalibreTask):
+    def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
+        super(TaskClearCoverThumbnailCache, self).__init__(task_message)
+        self.log = logger.create()
+        self.book_id = book_id
+        self.app_db_session = ub.get_new_session_instance()
+        self.cache = fs.FileSystem()
+
+    def run(self, worker_thread):
+        if self.app_db_session:
+            if self.book_id:
+                thumbnails = self.get_thumbnails_for_book(self.book_id)
+                for thumbnail in thumbnails:
+                    self.expire_and_delete_thumbnail(thumbnail)
+            else:
+                self.expire_and_delete_all_thumbnails()
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_thumbnails_for_book(self, book_id):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book_id)\
+            .all()
+
+    def expire_and_delete_thumbnail(self, thumbnail):
+        thumbnail.expiration = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnail: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def expire_and_delete_all_thumbnails(self):
+        self.app_db_session\
+            .query(ub.Thumbnail)\
+            .update({'expiration': datetime.utcnow()})
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error expiring book thumbnails: ' + str(ex))
+            self._handleError(u'Error expiring book thumbnails: ' + str(ex))
+            self.app_db_session.rollback()
+
+    @property
+    def name(self):
+        return "ThumbnailsClear"
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 576652d4..20d0802c 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -142,15 +142,18 @@
     </div>
   </div>
 
-    <div class="row form-group">
+  <div class="row form-group">
     <h2>{{_('Administration')}}</h2>
-      <div class="btn btn-default"><a id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a></div>
-      <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
-    </div>
-    <div class="row form-group">
-      <div class="btn btn-default" id="restart_database" data-toggle="modal" data-target="#StatusDialog">{{_('Reconnect Calibre Database')}}</div>
-      <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
-      <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
+    <div class="btn btn-default"><a id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a></div>
+    <div class="btn btn-default"><a id="logfile" href="{{url_for('admin.view_logfile')}}">{{_('View Logs')}}</a></div>
+  </div>
+  <div class="row form-group">
+    <div class="btn btn-default" id="restart_database" data-toggle="modal" data-target="#StatusDialog">{{_('Reconnect Calibre Database')}}</div>
+    <div class="btn btn-default" id="clear_cover_thumbnail_cache" data-toggle="modal" data-target="#ClearCacheDialog">{{_('Clear Cover Thumbnail Cache')}}</div>
+  </div>
+  <div class="row form-group">
+    <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
+    <div class="btn btn-default" id="admin_stop" data-toggle="modal" data-target="#ShutdownDialog">{{_('Shutdown')}}</div>
   </div>
 
   <div class="row">
@@ -231,4 +234,21 @@
     </div>
   </div>
 </div>
+<div id="ClearCacheDialog" class="modal fade" role="dialog">
+  <div class="modal-dialog modal-sm">
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header bg-info"></div>
+      <div class="modal-body text-center">
+        <p>{{_('Are you sure you want to clear the cover thumbnail cache?')}}</p>
+        <div id="spinner3" class="spinner" style="display:none;">
+          <img id="img-spinner3" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
+        </div>
+        <p></p>
+        <button type="button" class="btn btn-default" id="clear_cache" >{{_('OK')}}</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
 {% endblock %}
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 4e32db80..990f60ad 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,7 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" />
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
new file mode 100644
index 00000000..c5281797
--- /dev/null
+++ b/cps/templates/book_cover.html
@@ -0,0 +1,13 @@
+{% macro book_cover_image(book, thumbnails) -%}
+    {%- set book_title = book.title if book.title else book.name -%}
+    {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
+    {%- if srcset|length -%}
+        <img
+            srcset="{{ srcset }}"
+            src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
+            alt="{{ book_title }}"
+        />
+    {%- else -%}
+        <img src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}" alt="{{ book_title }}" />
+    {%- endif -%}
+{%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index c0fc141e..091beffc 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,9 +1,10 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        <img src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/>
+        {{ book_cover_image(book, book.id|get_book_thumbnails(thumbnails)) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 342cce53..3e2b65ac 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          <img src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" />
+          {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index d57994b4..02eff658 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover load-more">
@@ -9,7 +10,7 @@
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/fragment.html b/cps/templates/fragment.html
index 1421ea6a..901dd193 100644
--- a/cps/templates/fragment.html
+++ b/cps/templates/fragment.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 <div class="container-fluid">
   {% block body %}{% endblock %}
 </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 9724e31d..2eecd6c6 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <h1 class="{{page}}">{{_(title)}}</h1>
@@ -29,7 +30,7 @@
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='new', book_id=entry[0].series[0].id )}}">
                           <span class="img">
-                              <img src="{{ url_for('web.get_cover', book_id=entry[0].id) }}" alt="{{ entry[0].name }}"/>
+                              {{ book_cover_image(entry[0], entry[0].id|get_book_thumbnails(thumbnails)) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index d300fc65..579f19f7 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if g.user.show_detail_random() %}
@@ -9,7 +10,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img">
-                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -86,7 +87,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
+              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 318140fa..fef082bb 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,4 +1,5 @@
 {% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal, change_confirm_modal %}
+{% from 'book_cover.html' import book_cover_image %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index d11f3ec8..428655ea 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -44,7 +45,7 @@
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 1ad79dbd..e49a008f 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -1,3 +1,4 @@
+{% from 'book_cover.html' import book_cover_image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -31,7 +32,7 @@
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img">
-                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
+                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
diff --git a/cps/ub.py b/cps/ub.py
index ecf98679..af53e4f8 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -18,6 +18,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+import atexit
 import os
 import sys
 import datetime
@@ -441,6 +442,27 @@ class RemoteAuthToken(Base):
         return '<Token %r>' % self.id
 
 
+def filename(context):
+    file_format = context.get_current_parameters()['format']
+    if file_format == 'jpeg':
+        return context.get_current_parameters()['uuid'] + '.jpg'
+    else:
+        return context.get_current_parameters()['uuid'] + '.' + file_format
+
+
+class Thumbnail(Base):
+    __tablename__ = 'thumbnail'
+
+    id = Column(Integer, primary_key=True)
+    book_id = Column(Integer)
+    uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
+    format = Column(String, default='jpeg')
+    resolution = Column(SmallInteger, default=1)
+    filename = Column(String, default=filename)
+    generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
+    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
+
+
 # Add missing tables during migration of database
 def add_missing_tables(engine, session):
     if not engine.dialect.has_table(engine.connect(), "book_read_link"):
@@ -455,6 +477,8 @@ def add_missing_tables(engine, session):
         KoboStatistics.__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(), "thumbnail"):
+        Thumbnail.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "registration"):
         Registration.__table__.create(bind=engine)
         with engine.connect() as conn:
@@ -725,6 +749,16 @@ def init_db(app_db_path):
             sys.exit(3)
 
 
+def get_new_session_instance():
+    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
+    new_session = scoped_session(sessionmaker())
+    new_session.configure(bind=new_engine)
+
+    atexit.register(lambda: new_session.remove() if new_session else True)
+
+    return new_session
+
+
 def dispose():
     global session
 
diff --git a/cps/web.py b/cps/web.py
index ad8cd5da..5bf226ab 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,9 +50,10 @@ from . import constants, logger, isoLanguages, services
 from . import babel, db, ub, config, get_locale, app
 from . import calibre_db
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import check_valid_domain, render_task_status, \
-    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
-    send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password
+from .helper import check_valid_domain, render_task_status, get_cc_columns, get_book_cover, get_cached_book_cover, \
+    get_cached_book_cover_thumbnail, get_thumbnails_for_books, get_thumbnails_for_book_series, get_download_link, \
+    send_mail, generate_random_password, send_registration_mail, check_send_to_kindle, check_read_formats, \
+    tags_filters, reset_password
 from .pagination import Pagination
 from .redirect import redirect_back
 from .usermanagement import login_required_if_no_ano
@@ -411,8 +412,9 @@ def render_books_list(data, sort, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Books"), page=website)
+                                     title=_(u"Books"), page=website, thumbnails=thumbnails)
 
 
 def render_rated_books(page, book_id, order):
@@ -457,8 +459,9 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -482,12 +485,14 @@ def render_downloaded_books(page, order):
                              .filter(db.Books.id == book.id).first():
                 ub.delete_download(book.id)
 
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
                                      pagination=pagination,
                                      title=_(u"Downloaded books by %(user)s",user=current_user.nickname),
-                                     page="download")
+                                     page="download",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -498,6 +503,7 @@ def render_author_books(page, author_id, order):
                                                         db.Books.authors.any(db.Authors.id == author_id),
                                                         [order[0], db.Series.name, db.Books.series_index],
                                                         db.books_series_link,
+                                                        db.Books.id==db.books_series_link.c.book,
                                                         db.Series)
     if entries is None or not len(entries):
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
@@ -513,9 +519,10 @@ def render_author_books(page, author_id, order):
         author_info = services.goodreads_support.get_author_info(author_name)
         other_books = services.goodreads_support.get_other_books(author_info, entries)
 
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
-                                 other_books=other_books, page="author")
+                                 other_books=other_books, page="author", thumbnails=thumbnails)
 
 
 def render_publisher_books(page, book_id, order):
@@ -526,9 +533,12 @@ def render_publisher_books(page, book_id, order):
                                                                 db.Books.publishers.any(db.Publishers.id == book_id),
                                                                 [db.Series.name, order[0], db.Books.series_index],
                                                                 db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher")
+                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -540,8 +550,10 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Series: %(serie)s", serie=name.name), page="series")
+                                     title=_(u"Series: %(serie)s", serie=name.name), page="series",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -553,8 +565,10 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings")
+                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -566,8 +580,10 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"File format: %(format)s", format=name.format), page="formats")
+                                     title=_(u"File format: %(format)s", format=name.format), page="formats",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -579,9 +595,13 @@ def render_category_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0], db.Series.name, db.Books.series_index],
-                                                                db.books_series_link, db.Series)
+                                                                db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
+                                                                db.Series)
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category")
+                                     title=_(u"Category: %(name)s", name=name.name), page="category",
+                                     thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -599,8 +619,9 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
-                                 title=_(u"Language: %(name)s", name=lang_name), page="language")
+                                 title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
@@ -644,8 +665,10 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
+
+        thumbnails = get_thumbnails_for_books(entries + random)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename)
+                                     title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_archived_books(page, order):
@@ -668,8 +691,9 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
+    thumbnails = get_thumbnails_for_books(entries + random)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename)
+                                 title=name, page=pagename, thumbnails=thumbnails)
 
 
 def render_prepare_search_form(cc):
@@ -702,6 +726,7 @@ def render_prepare_search_form(cc):
 
 def render_search_results(term, offset=None, order=None, limit=None):
     entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit)
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  searchterm=term,
                                  pagination=pagination,
@@ -710,7 +735,8 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                  entries=entries,
                                  result_count=result_count,
                                  title=_(u"Search"),
-                                 page="search")
+                                 page="search",
+                                 thumbnails=thumbnails)
 
 
 # ################################### View Books list ##################################################################
@@ -740,6 +766,7 @@ def books_table():
     return render_title_template('book_table.html', title=_(u"Books List"), page="book_table",
                                  visiblility=visibility)
 
+
 @web.route("/ajax/listbooks")
 @login_required
 def list_books():
@@ -772,6 +799,7 @@ def list_books():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @web.route("/ajax/table_settings", methods=['POST'])
 @login_required
 def update_table_settings():
@@ -826,6 +854,7 @@ def publisher_list():
         charlist = calibre_db.session.query(func.upper(func.substr(db.Publishers.name, 1, 1)).label('char')) \
             .join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(func.upper(func.substr(db.Publishers.name, 1, 1))).all()
+
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher")
     else:
@@ -857,8 +886,10 @@ def series_list():
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
                 .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
 
+            thumbnails = get_thumbnails_for_book_series(entries)
             return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
-                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view")
+                                         title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
+                                         thumbnails=thumbnails)
     else:
         abort(404)
 
@@ -1235,13 +1266,16 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
+
+    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
                                  entries=q[offset:limit_all],
                                  result_count=result_count,
-                                 title=_(u"Advanced Search"), page="advsearch")
-
+                                 title=_(u"Advanced Search"),
+                                 page="advsearch",
+                                 thumbnails=thumbnails)
 
 
 @web.route("/advsearch", methods=['GET'])
@@ -1260,10 +1294,24 @@ def advanced_search_form():
 def get_cover(book_id):
     return get_book_cover(book_id)
 
+
+@web.route("/cached-cover/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover(cache_id):
+    return get_cached_book_cover(cache_id)
+
+
+@web.route("/cached-cover-thumbnail/<string:cache_id>")
+@login_required_if_no_ano
+def get_cached_cover_thumbnail(cache_id):
+    return get_cached_book_cover_thumbnail(cache_id)
+
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
 
+
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/show/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1293,7 +1341,6 @@ def serve_book(book_id, book_format, anyname):
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)
 
 
-
 @web.route("/download/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/download/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1481,9 +1528,6 @@ def logout():
     return redirect(url_for('web.login'))
 
 
-
-
-
 # ################################### Users own configuration #########################################################
 def change_profile_email(to_save, kobo_support, local_oauth_check, oauth_status):
     if "email" in to_save and to_save["email"] != current_user.email:
@@ -1683,6 +1727,7 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
+        thumbnails = get_thumbnails_for_books([entries])
         return render_title_template('detail.html',
                                      entry=entries,
                                      audioentries=audioentries,
@@ -1694,7 +1739,8 @@ def show_book(book_id):
                                      is_archived=is_archived,
                                      kindle_list=kindle_list,
                                      reader_list=reader_list,
-                                     page="book")
+                                     page="book",
+                                     thumbnails=thumbnails)
     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")
diff --git a/requirements.txt b/requirements.txt
index ca11eff9..5a26381e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+APScheduler>=3.6.3, <3.8.0
 Babel>=1.3, <2.9
 Flask-Babel>=0.11.1,<2.1.0
 Flask-Login>=0.3.2,<0.5.1

From 1e7a2c400ba6c6a6b661c1a086d85a95cd813806 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 20 Mar 2021 14:06:15 +0100
Subject: [PATCH 011/220] Fixed misstyping

---
 cps/config_sql.py  | 2 +-
 cps/db.py          | 2 +-
 cps/gdriveutils.py | 2 +-
 cps/ub.py          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index 17f1c613..78e6c9c9 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -24,7 +24,7 @@ import sys
 from sqlalchemy import exc, Column, String, Integer, SmallInteger, Boolean, BLOB, JSON
 from sqlalchemy.exc import OperationalError
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
diff --git a/cps/db.py b/cps/db.py
index f43cc811..883eec05 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -32,7 +32,7 @@ from sqlalchemy.orm import relationship, sessionmaker, scoped_session
 from sqlalchemy.orm.collections import InstrumentedList
 from sqlalchemy.ext.declarative import DeclarativeMeta
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 5f970554..c7a95ca5 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -29,7 +29,7 @@ from sqlalchemy import Column, UniqueConstraint
 from sqlalchemy import String, Integer
 from sqlalchemy.orm import sessionmaker, scoped_session
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
diff --git a/cps/ub.py b/cps/ub.py
index af53e4f8..4a76ea49 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -45,7 +45,7 @@ from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float,
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.sql.expression import func
 try:
-    # Compability with sqlalchemy 2.0
+    # Compatibility with sqlalchemy 2.0
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base

From 9a08bcd2bc0a5280cbb293d1306b7c4e2ad6d792 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 16 Sep 2021 23:20:11 -0500
Subject: [PATCH 012/220] Started addressing some PR comments

---
 cps/admin.py                  |  1 -
 cps/templates/book_cover.html |  3 ++-
 cps/updater.py                |  2 +-
 cps/web.py                    | 26 ++++++++++++++------------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 32d66a6f..98535320 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -41,7 +41,6 @@ from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
 from . import constants, logger, helper, services, isoLanguages, fs
-from .cli import filepicker
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index c5281797..67e7c24b 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,5 +1,6 @@
-{% macro book_cover_image(book, thumbnails) -%}
+{% macro book_cover_image(book, thumbnails, title) -%}
     {%- set book_title = book.title if book.title else book.name -%}
+    {%- set book_title = title if title else book_title -%}
     {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
     {%- if srcset|length -%}
         <img
diff --git a/cps/updater.py b/cps/updater.py
index 63ea23bf..8c6c9f7c 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -265,7 +265,7 @@ class Updater(threading.Thread):
             os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv',
             os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2',
             os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so', os.sep + 'cps' + os.sep + '.HOMEDIR',
-            os.sep + 'gmail.json'
+            os.sep + 'gmail.json', os.sep + 'cps' + os.sep + 'cache'
         )
         additional_path = self.is_venv()
         if additional_path:
diff --git a/cps/web.py b/cps/web.py
index 1b7148ea..64bdd8e4 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -415,7 +415,8 @@ def render_books_list(data, sort, book_id, page):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Books"), page=website, thumbnails=thumbnails)
 
@@ -466,7 +467,7 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
@@ -497,7 +498,7 @@ def render_downloaded_books(page, order, user_id):
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
 
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
@@ -550,7 +551,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
                                      thumbnails=thumbnails)
@@ -565,7 +566,7 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Series: %(serie)s", serie=name.name), page="series",
                                      thumbnails=thumbnails)
@@ -580,7 +581,7 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
                                      thumbnails=thumbnails)
@@ -595,7 +596,7 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"File format: %(format)s", format=name.format), page="formats",
                                      thumbnails=thumbnails)
@@ -613,7 +614,7 @@ def render_category_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Category: %(name)s", name=name.name), page="category",
                                      thumbnails=thumbnails)
@@ -634,7 +635,7 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
-    thumbnails = get_thumbnails_for_books(entries + random)
+    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
@@ -687,7 +688,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
 
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=name, page=pagename, thumbnails=thumbnails)
 
@@ -712,7 +713,7 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
-    thumbnails = get_thumbnails_for_books(entries + random)
+    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                  title=name, page=pagename, thumbnails=thumbnails)
 
@@ -1392,11 +1393,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         offset = 0
         limit_all = result_count
 
+    entries = q[offset:limit_all]
     thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
-                                 entries=q[offset:limit_all],
+                                 entries=entries,
                                  result_count=result_count,
                                  title=_(u"Advanced Search"),
                                  page="advsearch",

From d648785471b8213dc0d080c563aafba07f5408ab Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Fri, 17 Sep 2021 01:42:56 -0500
Subject: [PATCH 013/220] Review feedback fixes

---
 cps/helper.py                        |  5 +++--
 cps/jinjia.py                        |  2 ++
 cps/schedule.py                      |  7 +++++--
 cps/services/background_scheduler.py |  4 ++--
 cps/tasks/thumbnail.py               |  1 +
 cps/templates/book_cover.html        |  2 +-
 cps/ub.py                            |  2 +-
 cps/web.py                           | 22 +++++++++++-----------
 8 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 758d2531..6f22a701 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -554,13 +554,14 @@ def get_thumbnails_for_books(books):
     cache = fs.FileSystem()
     thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
 
-    return ub.session\
+    thumbnails = ub.session\
         .query(ub.Thumbnail)\
         .filter(ub.Thumbnail.book_id.in_(book_ids))\
-        .filter(ub.Thumbnail.filename.in_(thumbnail_files))\
         .filter(ub.Thumbnail.expiration > datetime.utcnow())\
         .all()
 
+    return list(filter(lambda t: t.filename in thumbnail_files, thumbnails))
+
 
 def get_thumbnails_for_book_series(series):
     books = list(map(lambda s: s[0], series))
diff --git a/cps/jinjia.py b/cps/jinjia.py
index ac6d3d33..5f86478c 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -129,10 +129,12 @@ def formatseriesindex_filter(series_index):
             return series_index
     return 0
 
+
 @jinjia.app_template_filter('escapedlink')
 def escapedlink_filter(url, text):
     return "<a href='{}'>{}</a>".format(url, escape(text))
 
+
 @jinjia.app_template_filter('uuidfilter')
 def uuidfilter(var):
     return uuid4()
diff --git a/cps/schedule.py b/cps/schedule.py
index 7ee43410..8ab9c732 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,6 +18,7 @@
 
 from __future__ import division, print_function, unicode_literals
 
+from datetime import datetime
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
@@ -26,8 +27,10 @@ from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumb
 def register_jobs():
     scheduler = BackgroundScheduler()
 
-    # Generate 100 book cover thumbnails every 5 minutes
-    scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=100), trigger='cron', minute='*/5')
+    # Generate up to 1000 book covers daily
+    generate_thumbnails_task = scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=1000),
+                                                  trigger='interval', days=1)
+    generate_thumbnails_task.modify(next_run_time=datetime.now())
 
     # Cleanup book cover cache every 6 hours
     scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index efa57379..122168e8 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -41,7 +41,7 @@ class BackgroundScheduler:
         return cls._instance
 
     def add(self, func, trigger, **trigger_args):
-        self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+        return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
     def add_task(self, user, task, trigger, **trigger_args):
         def scheduled_task():
@@ -49,4 +49,4 @@ class BackgroundScheduler:
             self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
             WorkerThread.add(user, worker_task)
 
-        self.add(func=scheduled_task, trigger=trigger, **trigger_args)
+        return self.add(func=scheduled_task, trigger=trigger, **trigger_args)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 70ddc06b..fed12e8b 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -37,6 +37,7 @@ except (ImportError, RuntimeError) as e:
 
 THUMBNAIL_RESOLUTION_1X = 1
 THUMBNAIL_RESOLUTION_2X = 2
+THUMBNAIL_RESOLUTION_3X = 3
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 67e7c24b..884ff4cd 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,4 +1,4 @@
-{% macro book_cover_image(book, thumbnails, title) -%}
+{% macro book_cover_image(book, thumbnails, title=None) -%}
     {%- set book_title = book.title if book.title else book.name -%}
     {%- set book_title = title if title else book_title -%}
     {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
diff --git a/cps/ub.py b/cps/ub.py
index 9d3a5845..e0bee4ef 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -532,7 +532,7 @@ class Thumbnail(Base):
     resolution = Column(SmallInteger, default=1)
     filename = Column(String, default=filename)
     generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
-    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=30))
+    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=90))
 
 
 # Add missing tables during migration of database
diff --git a/cps/web.py b/cps/web.py
index 64bdd8e4..f43bc6ad 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -416,7 +416,7 @@ def render_books_list(data, sort, book_id, page):
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
 
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Books"), page=website, thumbnails=thumbnails)
 
@@ -467,7 +467,7 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
@@ -498,7 +498,7 @@ def render_downloaded_books(page, order, user_id):
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
 
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
@@ -551,7 +551,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
                                      thumbnails=thumbnails)
@@ -566,7 +566,7 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Series: %(serie)s", serie=name.name), page="series",
                                      thumbnails=thumbnails)
@@ -581,7 +581,7 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
                                      thumbnails=thumbnails)
@@ -596,7 +596,7 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"File format: %(format)s", format=name.format), page="formats",
                                      thumbnails=thumbnails)
@@ -614,7 +614,7 @@ def render_category_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Category: %(name)s", name=name.name), page="category",
                                      thumbnails=thumbnails)
@@ -635,7 +635,7 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
-    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
@@ -688,7 +688,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
 
-        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=name, page=pagename, thumbnails=thumbnails)
 
@@ -713,7 +713,7 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
-    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
+    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                  title=name, page=pagename, thumbnails=thumbnails)
 

From 8bee2b9552f3ad2e0b3b04b1f3302d67e98b4614 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sun, 19 Sep 2021 22:45:19 -0500
Subject: [PATCH 014/220] Added CACHE_DIR env variable, graceful handling when
 APScheduler is not installed

---
 cps/constants.py                     |  5 ++++-
 cps/fs.py                            |  8 ++++++++
 cps/helper.py                        |  2 ++
 cps/schedule.py                      | 15 +++++++--------
 cps/services/background_scheduler.py | 26 +++++++++++++++++++-------
 5 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/cps/constants.py b/cps/constants.py
index 1e44796a..6a6b8f2b 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -40,7 +40,10 @@ else:
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
-CACHE_DIR           = os.path.join(BASE_DIR, 'cps', 'cache')
+
+# Cache dir - use CACHE_DIR environment variable, otherwise use the default directory: cps/cache
+DEFAULT_CACHE_DIR   = os.path.join(BASE_DIR, 'cps', 'cache')
+CACHE_DIR           = os.environ.get("CACHE_DIR", DEFAULT_CACHE_DIR)
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/fs.py b/cps/fs.py
index 699d5991..8528e39c 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -50,6 +50,14 @@ class FileSystem:
         path = self.get_cache_dir(cache_type)
         return [file for file in listdir(path) if isfile(join(path, file))]
 
+    def list_existing_cache_files(self, filenames, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file)) and file in filenames]
+
+    def list_missing_cache_files(self, filenames, cache_type=None):
+        path = self.get_cache_dir(cache_type)
+        return [file for file in listdir(path) if isfile(join(path, file)) and file not in filenames]
+
     def delete_cache_dir(self, cache_type=None):
         if not cache_type and isdir(self._cache_dir):
             rmtree(self._cache_dir)
diff --git a/cps/helper.py b/cps/helper.py
index 6f22a701..688bc615 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -405,6 +405,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                      src=new_path, dest=new_name, error=str(ex))
     return False
 
+
 def update_dir_structure_gdrive(book_id, first_author):
     error = False
     book = calibre_db.get_book(book_id)
@@ -505,6 +506,7 @@ def uniq(inpt):
             output.append(x)
     return output
 
+
 def check_email(email):
     email = valid_email(email)
     if ub.session.query(ub.User).filter(func.lower(ub.User.email) == email.lower()).first():
diff --git a/cps/schedule.py b/cps/schedule.py
index 8ab9c732..649b65a3 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -27,13 +27,12 @@ from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumb
 def register_jobs():
     scheduler = BackgroundScheduler()
 
-    # Generate up to 1000 book covers daily
-    generate_thumbnails_task = scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(limit=1000),
-                                                  trigger='interval', days=1)
-    generate_thumbnails_task.modify(next_run_time=datetime.now())
+    if scheduler:
+        # Reconnect metadata.db once every 12 hours
+        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=12)
 
-    # Cleanup book cover cache every 6 hours
-    scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', minute='15', hour='*/6')
+        # Cleanup book cover cache once every 24 hours
+        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='interval', days=1)
 
-    # Reconnect metadata.db every 4 hours
-    scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', minute='5', hour='*/4')
+        # Generate all missing book cover thumbnails once every 24 hours
+        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='interval', days=1)
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 122168e8..f2688b7f 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -21,13 +21,23 @@ import atexit
 
 from .. import logger
 from .worker import WorkerThread
-from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+
+try:
+    from apscheduler.schedulers.background import BackgroundScheduler as BScheduler
+    use_APScheduler = True
+except (ImportError, RuntimeError) as e:
+    use_APScheduler = False
+    log = logger.create()
+    log.info(f'APScheduler not found. Unable to schedule tasks.')
 
 
 class BackgroundScheduler:
     _instance = None
 
     def __new__(cls):
+        if not use_APScheduler:
+            return False
+
         if cls._instance is None:
             cls._instance = super(BackgroundScheduler, cls).__new__(cls)
 
@@ -41,12 +51,14 @@ class BackgroundScheduler:
         return cls._instance
 
     def add(self, func, trigger, **trigger_args):
-        return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+        if use_APScheduler:
+            return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
     def add_task(self, user, task, trigger, **trigger_args):
-        def scheduled_task():
-            worker_task = task()
-            self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
-            WorkerThread.add(user, worker_task)
+        if use_APScheduler:
+            def scheduled_task():
+                worker_task = task()
+                self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+                WorkerThread.add(user, worker_task)
 
-        return self.add(func=scheduled_task, trigger=trigger, **trigger_args)
+            return self.add(func=scheduled_task, trigger=trigger, **trigger_args)

From 524ed07a6c3daf6c8e746a9b5e69f76742fe2301 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Tue, 21 Sep 2021 23:39:00 -0500
Subject: [PATCH 015/220] Handle read only access to cache dir gracefully.
 minor cleanup

---
 cps.py                               |  3 +-
 cps/fs.py                            | 44 ++++++++++++++++++++++------
 cps/schedule.py                      | 12 +++++---
 cps/services/background_scheduler.py |  4 +--
 4 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/cps.py b/cps.py
index 82137bbc..fe006551 100755
--- a/cps.py
+++ b/cps.py
@@ -44,7 +44,7 @@ from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.search_metadata import meta
 from cps.error_handler import init_errorhandler
-from cps.schedule import register_jobs
+from cps.schedule import register_jobs, register_startup_jobs
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -83,6 +83,7 @@ def main():
 
     # Register scheduled jobs
     register_jobs()
+    # register_startup_jobs()
 
     success = web_server.start()
     sys.exit(0 if success else 1)
diff --git a/cps/fs.py b/cps/fs.py
index 8528e39c..4f835fa6 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -17,6 +17,7 @@
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+from . import logger
 from .constants import CACHE_DIR
 from os import listdir, makedirs, remove
 from os.path import isdir, isfile, join
@@ -32,16 +33,26 @@ class FileSystem:
     def __new__(cls):
         if cls._instance is None:
             cls._instance = super(FileSystem, cls).__new__(cls)
+            cls.log = logger.create()
         return cls._instance
 
     def get_cache_dir(self, cache_type=None):
         if not isdir(self._cache_dir):
-            makedirs(self._cache_dir)
+            try:
+                makedirs(self._cache_dir)
+            except OSError:
+                self.log.info(f'Failed to create path {self._cache_dir} (Permission denied).')
+                return False
 
-        if cache_type and not isdir(join(self._cache_dir, cache_type)):
-            makedirs(join(self._cache_dir, cache_type))
+        path = join(self._cache_dir, cache_type)
+        if cache_type and not isdir(path):
+            try:
+                makedirs(path)
+            except OSError:
+                self.log.info(f'Failed to create path {path} (Permission denied).')
+                return False
 
-        return join(self._cache_dir, cache_type) if cache_type else self._cache_dir
+        return path if cache_type else self._cache_dir
 
     def get_cache_file_path(self, filename, cache_type=None):
         return join(self.get_cache_dir(cache_type), filename) if filename else None
@@ -60,10 +71,25 @@ class FileSystem:
 
     def delete_cache_dir(self, cache_type=None):
         if not cache_type and isdir(self._cache_dir):
-            rmtree(self._cache_dir)
-        if cache_type and isdir(join(self._cache_dir, cache_type)):
-            rmtree(join(self._cache_dir, cache_type))
+            try:
+                rmtree(self._cache_dir)
+            except OSError:
+                self.log.info(f'Failed to delete path {self._cache_dir} (Permission denied).')
+                return False
+
+        path = join(self._cache_dir, cache_type)
+        if cache_type and isdir(path):
+            try:
+                rmtree(path)
+            except OSError:
+                self.log.info(f'Failed to delete path {path} (Permission denied).')
+                return False
 
     def delete_cache_file(self, filename, cache_type=None):
-        if isfile(join(self.get_cache_dir(cache_type), filename)):
-            remove(join(self.get_cache_dir(cache_type), filename))
+        path = join(self.get_cache_dir(cache_type), filename)
+        if isfile(path):
+            try:
+                remove(path)
+            except OSError:
+                self.log.info(f'Failed to delete path {path} (Permission denied).')
+                return False
diff --git a/cps/schedule.py b/cps/schedule.py
index 649b65a3..d427d908 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -18,8 +18,8 @@
 
 from __future__ import division, print_function, unicode_literals
 
-from datetime import datetime
 from .services.background_scheduler import BackgroundScheduler
+from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
 
@@ -29,10 +29,14 @@ def register_jobs():
 
     if scheduler:
         # Reconnect metadata.db once every 12 hours
-        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='interval', hours=12)
+        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
 
         # Cleanup book cover cache once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='interval', days=1)
+        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', hour=4)
 
         # Generate all missing book cover thumbnails once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='interval', days=1)
+        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+
+
+def register_startup_jobs():
+    WorkerThread.add(None, TaskGenerateCoverThumbnails())
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index f2688b7f..1b588ac2 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -28,7 +28,7 @@ try:
 except (ImportError, RuntimeError) as e:
     use_APScheduler = False
     log = logger.create()
-    log.info(f'APScheduler not found. Unable to schedule tasks.')
+    log.info('APScheduler not found. Unable to schedule tasks.')
 
 
 class BackgroundScheduler:
@@ -58,7 +58,7 @@ class BackgroundScheduler:
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
-                self.log.info('Running scheduled task in background: ' + worker_task.name + ': ' + worker_task.message)
+                self.log.info(f'Running scheduled task in background: {worker_task.name} - {worker_task.message}')
                 WorkerThread.add(user, worker_task)
 
             return self.add(func=scheduled_task, trigger=trigger, **trigger_args)

From be28a9131553b7f29df6c712096530bdb62ae122 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Fri, 24 Sep 2021 03:11:14 -0500
Subject: [PATCH 016/220] Simplified all of the thumbnail generation and
 loading.

---
 cps/fs.py                     |  14 +-
 cps/helper.py                 |  61 +--------
 cps/jinjia.py                 |  26 ++--
 cps/schedule.py               |   5 +-
 cps/tasks/thumbnail.py        | 250 +++++++---------------------------
 cps/templates/author.html     |   3 +-
 cps/templates/book_cover.html |  19 ++-
 cps/templates/book_edit.html  |   3 +-
 cps/templates/detail.html     |   3 +-
 cps/templates/discover.html   |   3 +-
 cps/templates/grid.html       |   3 +-
 cps/templates/index.html      |   6 +-
 cps/templates/search.html     |   3 +-
 cps/templates/shelf.html      |   3 +-
 cps/ub.py                     |   2 +-
 cps/web.py                    |  83 +++--------
 16 files changed, 111 insertions(+), 376 deletions(-)

diff --git a/cps/fs.py b/cps/fs.py
index 4f835fa6..30ab552a 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -57,17 +57,9 @@ class FileSystem:
     def get_cache_file_path(self, filename, cache_type=None):
         return join(self.get_cache_dir(cache_type), filename) if filename else None
 
-    def list_cache_files(self, cache_type=None):
-        path = self.get_cache_dir(cache_type)
-        return [file for file in listdir(path) if isfile(join(path, file))]
-
-    def list_existing_cache_files(self, filenames, cache_type=None):
-        path = self.get_cache_dir(cache_type)
-        return [file for file in listdir(path) if isfile(join(path, file)) and file in filenames]
-
-    def list_missing_cache_files(self, filenames, cache_type=None):
-        path = self.get_cache_dir(cache_type)
-        return [file for file in listdir(path) if isfile(join(path, file)) and file not in filenames]
+    def get_cache_file_exists(self, filename, cache_type=None):
+        path = self.get_cache_file_path(filename, cache_type)
+        return isfile(path)
 
     def delete_cache_dir(self, cache_type=None):
         if not cache_type and isdir(self._cache_dir):
diff --git a/cps/helper.py b/cps/helper.py
index 688bc615..1652be23 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -35,7 +35,7 @@ from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_login import current_user
-from sqlalchemy.sql.expression import true, false, and_, text, func
+from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from markupsafe import escape
@@ -550,26 +550,6 @@ def delete_book(book, calibrepath, book_format):
         return delete_book_file(book, calibrepath, book_format)
 
 
-def get_thumbnails_for_books(books):
-    books_with_covers = list(filter(lambda b: b.has_cover, books))
-    book_ids = list(map(lambda b: b.id, books_with_covers))
-    cache = fs.FileSystem()
-    thumbnail_files = cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
-
-    thumbnails = ub.session\
-        .query(ub.Thumbnail)\
-        .filter(ub.Thumbnail.book_id.in_(book_ids))\
-        .filter(ub.Thumbnail.expiration > datetime.utcnow())\
-        .all()
-
-    return list(filter(lambda t: t.filename in thumbnail_files, thumbnails))
-
-
-def get_thumbnails_for_book_series(series):
-    books = list(map(lambda s: s[0], series))
-    return get_thumbnails_for_books(books)
-
-
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
         return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
@@ -577,9 +557,9 @@ def get_cover_on_failure(use_generic_cover):
         return None
 
 
-def get_book_cover(book_id):
+def get_book_cover(book_id, resolution=None):
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True)
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
 def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
@@ -587,37 +567,6 @@ def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
     return get_book_cover_internal(book, use_generic_cover_on_failure)
 
 
-def get_cached_book_cover(cache_id):
-    parts = cache_id.split('_')
-    book_uuid = parts[0] if len(parts) else None
-    resolution = parts[2] if len(parts) > 2 else None
-    book = calibre_db.get_book_by_uuid(book_uuid) if book_uuid else None
-    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
-
-
-def get_cached_book_cover_thumbnail(cache_id):
-    parts = cache_id.split('_')
-    thumbnail_uuid = parts[0] if len(parts) else None
-    thumbnail = None
-    if thumbnail_uuid:
-        thumbnail = ub.session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.uuid == thumbnail_uuid)\
-            .first()
-
-    if thumbnail and thumbnail.expiration > datetime.utcnow():
-        cache = fs.FileSystem()
-        if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
-            return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
-
-    elif thumbnail:
-        book = calibre_db.get_book(thumbnail.book_id)
-        return get_book_cover_internal(book, use_generic_cover_on_failure=True)
-
-    else:
-        return get_cover_on_failure(True)
-
-
 def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
     if book and book.has_cover:
 
@@ -626,7 +575,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
                 cache = fs.FileSystem()
-                if cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                if cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
                     return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
 
         # Send the book cover from Google Drive if configured
@@ -661,7 +610,7 @@ def get_book_cover_thumbnail(book, resolution):
             .query(ub.Thumbnail)\
             .filter(ub.Thumbnail.book_id == book.id)\
             .filter(ub.Thumbnail.resolution == resolution)\
-            .filter(ub.Thumbnail.expiration > datetime.utcnow())\
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
             .first()
 
 
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 5f86478c..8c8b72a9 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -33,6 +33,7 @@ from flask_babel import get_locale
 from flask_login import current_user
 from markupsafe import escape
 from . import logger
+from .tasks.thumbnail import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X
 
 
 jinjia = Blueprint('jinjia', __name__)
@@ -140,24 +141,17 @@ def uuidfilter(var):
     return uuid4()
 
 
-@jinjia.app_template_filter('book_cover_cache_id')
-def book_cover_cache_id(book, resolution=None):
+@jinjia.app_template_filter('last_modified')
+def book_cover_cache_id(book):
     timestamp = int(book.last_modified.timestamp() * 1000)
-    cache_bust = str(book.uuid) + '_' + str(timestamp)
-    return cache_bust if not resolution else cache_bust + '_' + str(resolution)
+    return str(timestamp)
 
 
-@jinjia.app_template_filter('get_book_thumbnails')
-def get_book_thumbnails(book_id, thumbnails=None):
-    return list(filter(lambda t: t.book_id == book_id, thumbnails)) if book_id > -1 and thumbnails else list()
-
-
-@jinjia.app_template_filter('get_book_thumbnail_srcset')
-def get_book_thumbnail_srcset(thumbnails):
+@jinjia.app_template_filter('get_cover_srcset')
+def get_cover_srcset(book):
     srcset = list()
-    for thumbnail in thumbnails:
-        timestamp = int(thumbnail.generated_at.timestamp() * 1000)
-        cache_id = str(thumbnail.uuid) + '_' + str(timestamp)
-        url = url_for('web.get_cached_cover_thumbnail', cache_id=cache_id)
-        srcset.append(url + ' ' + str(thumbnail.resolution) + 'x')
+    for resolution in [THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X]:
+        timestamp = int(book.last_modified.timestamp() * 1000)
+        url = url_for('web.get_cover', book_id=book.id, resolution=resolution, cache_bust=str(timestamp))
+        srcset.append(f'{url} {resolution}x')
     return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
index d427d908..8c350bd5 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -21,7 +21,7 @@ from __future__ import division, print_function, unicode_literals
 from .services.background_scheduler import BackgroundScheduler
 from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskSyncCoverThumbnailCache, TaskGenerateCoverThumbnails
+from .tasks.thumbnail import TaskGenerateCoverThumbnails
 
 
 def register_jobs():
@@ -31,9 +31,6 @@ def register_jobs():
         # Reconnect metadata.db once every 12 hours
         scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
 
-        # Cleanup book cover cache once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskSyncCoverThumbnailCache(), trigger='cron', hour=4)
-
         # Generate all missing book cover thumbnails once every 24 hours
         scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
 
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index fed12e8b..688f6e4b 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -22,7 +22,7 @@ import os
 from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask
 from datetime import datetime, timedelta
-from sqlalchemy import func
+from sqlalchemy import or_
 
 try:
     from urllib.request import urlopen
@@ -41,9 +41,8 @@ THUMBNAIL_RESOLUTION_3X = 3
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
-    def __init__(self, limit=100, task_message=u'Generating cover thumbnails'):
+    def __init__(self, task_message=u'Generating cover thumbnails'):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
-        self.limit = limit
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
@@ -55,74 +54,51 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM:
-            expired_thumbnails = self.get_expired_thumbnails()
-            thumbnail_book_ids = self.get_thumbnail_book_ids()
-            books_without_thumbnails = self.get_books_without_thumbnails(thumbnail_book_ids)
+            books_with_covers = self.get_books_with_covers()
+            count = len(books_with_covers)
 
-            count = len(books_without_thumbnails)
-            if count == 0:
-                # Do not display this task on the frontend if there are no covers to update
-                self.self_cleanup = True
+            updated = 0
+            generated = 0
+            for i, book in enumerate(books_with_covers):
+                book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
 
-            for i, book in enumerate(books_without_thumbnails):
-                for resolution in self.resolutions:
-                    expired_thumbnail = self.get_expired_thumbnail_for_book_and_resolution(
-                        book,
-                        resolution,
-                        expired_thumbnails
-                    )
-                    if expired_thumbnail:
-                        self.update_book_thumbnail(book, expired_thumbnail)
-                    else:
-                        self.create_book_thumbnail(book, resolution)
+                # Generate new thumbnails for missing covers
+                resolutions = list(map(lambda t: t.resolution, book_cover_thumbnails))
+                missing_resolutions = list(set(self.resolutions).difference(resolutions))
+                for resolution in missing_resolutions:
+                    generated += 1
+                    self.create_book_cover_thumbnail(book, resolution)
 
-                self.message = u'Generating cover thumbnail {0} of {1}'.format(i + 1, count)
+                # Replace outdated or missing thumbnails
+                for thumbnail in book_cover_thumbnails:
+                    if book.last_modified > thumbnail.generated_at:
+                        updated += 1
+                        self.update_book_cover_thumbnail(book, thumbnail)
+
+                    elif not self.cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                        updated += 1
+                        self.update_book_cover_thumbnail(book, thumbnail)
+
+                self.message = u'Processing book {0} of {1}'.format(i + 1, count)
                 self.progress = (1.0 / count) * i
 
         self._handleSuccess()
         self.app_db_session.remove()
 
-    def get_expired_thumbnails(self):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.expiration < datetime.utcnow())\
-            .all()
-
-    def get_thumbnail_book_ids(self):
-        return self.app_db_session\
-            .query(ub.Thumbnail.book_id)\
-            .group_by(ub.Thumbnail.book_id)\
-            .having(func.min(ub.Thumbnail.expiration) > datetime.utcnow())\
-            .distinct()
-
-    def get_books_without_thumbnails(self, thumbnail_book_ids):
+    def get_books_with_covers(self):
         return self.calibre_db.session\
             .query(db.Books)\
             .filter(db.Books.has_cover == 1)\
-            .filter(db.Books.id.notin_(thumbnail_book_ids))\
-            .limit(self.limit)\
             .all()
 
-    def get_expired_thumbnail_for_book_and_resolution(self, book, resolution, expired_thumbnails):
-        for thumbnail in expired_thumbnails:
-            if thumbnail.book_id == book.id and thumbnail.resolution == resolution:
-                return thumbnail
+    def get_book_cover_thumbnails(self, book_id):
+        return self.app_db_session\
+            .query(ub.Thumbnail)\
+            .filter(ub.Thumbnail.book_id == book_id)\
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
+            .all()
 
-        return None
-
-    def update_book_thumbnail(self, book, thumbnail):
-        thumbnail.generated_at = datetime.utcnow()
-        thumbnail.expiration = datetime.utcnow() + timedelta(days=30)
-
-        try:
-            self.app_db_session.commit()
-            self.generate_book_thumbnail(book, thumbnail)
-        except Exception as ex:
-            self.log.info(u'Error updating book thumbnail: ' + str(ex))
-            self._handleError(u'Error updating book thumbnail: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def create_book_thumbnail(self, book, resolution):
+    def create_book_cover_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
         thumbnail.book_id = book.id
         thumbnail.format = 'jpeg'
@@ -137,6 +113,18 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self._handleError(u'Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
+    def update_book_cover_thumbnail(self, book, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+            self.generate_book_thumbnail(book, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
     def generate_book_thumbnail(self, book, thumbnail):
         if book and thumbnail:
             if config.config_use_google_drive:
@@ -190,128 +178,6 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         return "ThumbnailsGenerate"
 
 
-class TaskSyncCoverThumbnailCache(CalibreTask):
-    def __init__(self, task_message=u'Syncing cover thumbnail cache'):
-        super(TaskSyncCoverThumbnailCache, self).__init__(task_message)
-        self.log = logger.create()
-        self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
-        self.cache = fs.FileSystem()
-
-    def run(self, worker_thread):
-        cached_thumbnail_files = self.cache.list_cache_files(fs.CACHE_TYPE_THUMBNAILS)
-
-        # Expire thumbnails in the database if the cached file is missing
-        # This case will happen if a user deletes the cache dir or cached files
-        if self.app_db_session:
-            self.expire_missing_thumbnails(cached_thumbnail_files)
-            self.progress = 0.25
-
-        # Delete thumbnails in the database if the book has been removed
-        # This case will happen if a book is removed in Calibre and the metadata.db file is updated in the filesystem
-        if self.app_db_session and self.calibre_db:
-            book_ids = self.get_book_ids()
-            self.delete_thumbnails_for_missing_books(book_ids)
-            self.progress = 0.50
-
-        # Expire thumbnails in the database if their corresponding book has been updated since they were generated
-        # This case will happen if the book was updated externally
-        if self.app_db_session and self.cache:
-            books = self.get_books_updated_in_the_last_day()
-            book_ids = list(map(lambda b: b.id, books))
-            thumbnails = self.get_thumbnails_for_updated_books(book_ids)
-            self.expire_thumbnails_for_updated_book(books, thumbnails)
-            self.progress = 0.75
-
-        # Delete extraneous cached thumbnail files
-        # This case will happen if a book was deleted and the thumbnail OR the metadata.db file was changed externally
-        if self.app_db_session:
-            db_thumbnail_files = self.get_thumbnail_filenames()
-            self.delete_extraneous_thumbnail_files(cached_thumbnail_files, db_thumbnail_files)
-
-        self._handleSuccess()
-        self.app_db_session.remove()
-
-    def expire_missing_thumbnails(self, filenames):
-        try:
-            self.app_db_session\
-                .query(ub.Thumbnail)\
-                .filter(ub.Thumbnail.filename.notin_(filenames))\
-                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
-            self.app_db_session.commit()
-        except Exception as ex:
-            self.log.info(u'Error expiring thumbnails for missing cache files: ' + str(ex))
-            self._handleError(u'Error expiring thumbnails for missing cache files: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def get_book_ids(self):
-        results = self.calibre_db.session\
-            .query(db.Books.id)\
-            .filter(db.Books.has_cover == 1)\
-            .distinct()
-
-        return [value for value, in results]
-
-    def delete_thumbnails_for_missing_books(self, book_ids):
-        try:
-            self.app_db_session\
-                .query(ub.Thumbnail)\
-                .filter(ub.Thumbnail.book_id.notin_(book_ids))\
-                .delete(synchronize_session=False)
-            self.app_db_session.commit()
-        except Exception as ex:
-            self.log.info(str(ex))
-            self._handleError(u'Error deleting thumbnails for missing books: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def get_thumbnail_filenames(self):
-        results = self.app_db_session\
-            .query(ub.Thumbnail.filename)\
-            .all()
-
-        return [thumbnail for thumbnail, in results]
-
-    def delete_extraneous_thumbnail_files(self, cached_thumbnail_files, db_thumbnail_files):
-        extraneous_files = list(set(cached_thumbnail_files).difference(db_thumbnail_files))
-        for file in extraneous_files:
-            self.cache.delete_cache_file(file, fs.CACHE_TYPE_THUMBNAILS)
-
-    def get_books_updated_in_the_last_day(self):
-        return self.calibre_db.session\
-            .query(db.Books)\
-            .filter(db.Books.has_cover == 1)\
-            .filter(db.Books.last_modified > datetime.utcnow() - timedelta(days=1, hours=1))\
-            .all()
-
-    def get_thumbnails_for_updated_books(self, book_ids):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id.in_(book_ids))\
-            .all()
-
-    def expire_thumbnails_for_updated_book(self, books, thumbnails):
-        thumbnail_ids = list()
-        for book in books:
-            for thumbnail in thumbnails:
-                if thumbnail.book_id == book.id and thumbnail.generated_at < book.last_modified:
-                    thumbnail_ids.append(thumbnail.id)
-
-        try:
-            self.app_db_session\
-                .query(ub.Thumbnail)\
-                .filter(ub.Thumbnail.id.in_(thumbnail_ids)) \
-                .update({"expiration": datetime.utcnow()}, synchronize_session=False)
-            self.app_db_session.commit()
-        except Exception as ex:
-            self.log.info(u'Error expiring thumbnails for updated books: ' + str(ex))
-            self._handleError(u'Error expiring thumbnails for updated books: ' + str(ex))
-            self.app_db_session.rollback()
-
-    @property
-    def name(self):
-        return "ThumbnailsSync"
-
-
 class TaskClearCoverThumbnailCache(CalibreTask):
     def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
@@ -325,9 +191,9 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             if self.book_id:
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
                 for thumbnail in thumbnails:
-                    self.expire_and_delete_thumbnail(thumbnail)
+                    self.delete_thumbnail(thumbnail)
             else:
-                self.expire_and_delete_all_thumbnails()
+                self.delete_all_thumbnails()
 
         self._handleSuccess()
         self.app_db_session.remove()
@@ -338,29 +204,19 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .filter(ub.Thumbnail.book_id == book_id)\
             .all()
 
-    def expire_and_delete_thumbnail(self, thumbnail):
-        thumbnail.expiration = datetime.utcnow()
-
+    def delete_thumbnail(self, thumbnail):
         try:
-            self.app_db_session.commit()
             self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info(u'Error expiring book thumbnail: ' + str(ex))
-            self._handleError(u'Error expiring book thumbnail: ' + str(ex))
-            self.app_db_session.rollback()
-
-    def expire_and_delete_all_thumbnails(self):
-        self.app_db_session\
-            .query(ub.Thumbnail)\
-            .update({'expiration': datetime.utcnow()})
+            self.log.info(u'Error deleting book thumbnail: ' + str(ex))
+            self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
+    def delete_all_thumbnails(self):
         try:
-            self.app_db_session.commit()
             self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info(u'Error expiring book thumbnails: ' + str(ex))
-            self._handleError(u'Error expiring book thumbnails: ' + str(ex))
-            self.app_db_session.rollback()
+            self.log.info(u'Error deleting book thumbnails: ' + str(ex))
+            self._handleError(u'Error deleting book thumbnails: ' + str(ex))
 
     @property
     def name(self):
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 3a4e6c57..2ff1ce7a 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,8 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img">
-              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-              <!-- <img title="{{author.name|safe}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" /> -->
+              {{ book_cover_image(entry, title=author.name|safe) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index 884ff4cd..7d3a84f4 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,14 +1,11 @@
-{% macro book_cover_image(book, thumbnails, title=None) -%}
+{% macro book_cover_image(book, title=None) -%}
     {%- set book_title = book.title if book.title else book.name -%}
     {%- set book_title = title if title else book_title -%}
-    {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
-    {%- if srcset|length -%}
-        <img
-            srcset="{{ srcset }}"
-            src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}"
-            alt="{{ book_title }}"
-        />
-    {%- else -%}
-        <img src="{{ url_for('web.get_cached_cover', cache_id=book|book_cover_cache_id) }}" alt="{{ book_title }}" />
-    {%- endif -%}
+    {% set srcset = book|get_cover_srcset %}
+    <img
+        srcset="{{ srcset }}"
+        src="{{ url_for('web.get_cover', book_id=book.id, resolution=0, cache_bust=book|last_modified) }}"
+        title="{{ book_title }}"
+        alt="{{ book_title }}"
+    />
 {%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index bce329d0..8525b8e3 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -4,8 +4,7 @@
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book, book.id|get_book_thumbnails(thumbnails)) }}
-        <!-- <img id="detailcover" title="{{book.title}}" src="{{ url_for('web.get_cover', book_id=book.id, edit=1|uuidfilter)  }}" alt="{{ book.title }}"/> -->
+        {{ book_cover_image(book) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index ea870d4c..b538ff9a 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,8 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-          <!-- <img id="detailcover" title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id, edit=1|uuidfilter) }}" alt="{{ entry.title }}" /> -->
+          {{ book_cover_image(entry) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index ecfc83d0..01cd393d 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -10,8 +10,7 @@
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-              <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+              {{ book_cover_image(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 5a3c1e01..45fb53bf 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -29,8 +29,7 @@
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}">
                           <span class="img">
-                              {{ book_cover_image(entry[0], entry[0].id|get_book_thumbnails(thumbnails)) }}
-                              <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry[0].id) }}" alt="{{ entry[0].name }}"/> -->
+                              {{ book_cover_image(entry[0], title=entry[0].series[0].name|shortentitle) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index c38ba01e..e47c6c70 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -10,8 +10,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img">
-                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-                <!-- <img title="{{ entry.title }}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+                {{ book_cover_image(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -88,8 +87,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-              {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-              <!-- <img title="{{ entry.title }}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/> -->
+              {{ book_cover_image(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index cf9c4fe7..872b6dc1 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -45,8 +45,7 @@
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-                <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+                {{ book_cover_image(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index cb08be90..0e5865c9 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -32,8 +32,7 @@
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img">
-                {{ book_cover_image(entry, entry.id|get_book_thumbnails(thumbnails)) }}
-                <!-- <img title="{{entry.title}}" src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" /> -->
+                {{ book_cover_image(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
diff --git a/cps/ub.py b/cps/ub.py
index e0bee4ef..f108a1ce 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -532,7 +532,7 @@ class Thumbnail(Base):
     resolution = Column(SmallInteger, default=1)
     filename = Column(String, default=filename)
     generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
-    expiration = Column(DateTime, default=lambda: datetime.datetime.utcnow() + datetime.timedelta(days=90))
+    expiration = Column(DateTime, nullable=True)
 
 
 # Add missing tables during migration of database
diff --git a/cps/web.py b/cps/web.py
index f43bc6ad..8f78ff32 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -51,7 +51,6 @@ from . import babel, db, ub, config, get_locale, app
 from . import calibre_db
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, check_email, check_username, \
-    get_cached_book_cover, get_cached_book_cover_thumbnail, get_thumbnails_for_books, get_thumbnails_for_book_series, \
     get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email
 from .pagination import Pagination
@@ -415,10 +414,8 @@ def render_books_list(data, sort, book_id, page):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Books"), page=website, thumbnails=thumbnails)
+                                     title=_(u"Books"), page=website)
 
 
 def render_rated_books(page, book_id, order):
@@ -467,9 +464,8 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
+                                     title=_(u"Hot Books (Most Downloaded)"), page="hot")
     else:
         abort(404)
 
@@ -497,16 +493,13 @@ def render_downloaded_books(page, order, user_id):
                              .filter(db.Books.id == book.id).first():
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
-
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
                                      pagination=pagination,
                                      id=user_id,
                                      title=_(u"Downloaded books by %(user)s",user=user.name),
-                                     page="download",
-                                     thumbnails=thumbnails)
+                                     page="download")
     else:
         abort(404)
 
@@ -535,10 +528,9 @@ def render_author_books(page, author_id, order):
         author_info = services.goodreads_support.get_author_info(author_name)
         other_books = services.goodreads_support.get_other_books(author_info, entries)
 
-    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
-                                 other_books=other_books, page="author", thumbnails=thumbnails)
+                                 other_books=other_books, page="author")
 
 
 def render_publisher_books(page, book_id, order):
@@ -551,10 +543,8 @@ def render_publisher_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher")
     else:
         abort(404)
 
@@ -566,10 +556,8 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Series: %(serie)s", serie=name.name), page="series",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Series: %(serie)s", serie=name.name), page="series")
     else:
         abort(404)
 
@@ -581,10 +569,8 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings")
     else:
         abort(404)
 
@@ -596,10 +582,8 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"File format: %(format)s", format=name.format), page="formats",
-                                     thumbnails=thumbnails)
+                                     title=_(u"File format: %(format)s", format=name.format), page="formats")
     else:
         abort(404)
 
@@ -614,10 +598,8 @@ def render_category_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category",
-                                     thumbnails=thumbnails)
+                                     title=_(u"Category: %(name)s", name=name.name), page="category")
     else:
         abort(404)
 
@@ -635,9 +617,8 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
-    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
-                                 title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
+                                 title=_(u"Language: %(name)s", name=lang_name), page="language")
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
@@ -687,10 +668,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
-
-        thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename, thumbnails=thumbnails)
+                                     title=name, page=pagename)
 
 
 def render_archived_books(page, order):
@@ -713,9 +692,8 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
-    thumbnails = get_thumbnails_for_books(entries + random if type(random) is list else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename, thumbnails=thumbnails)
+                                 title=name, page=pagename)
 
 
 def render_prepare_search_form(cc):
@@ -752,7 +730,6 @@ def render_prepare_search_form(cc):
 def render_search_results(term, offset=None, order=None, limit=None):
     join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
     entries, result_count, pagination = calibre_db.get_search_results(term, offset, order, limit, *join)
-    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  searchterm=term,
                                  pagination=pagination,
@@ -761,8 +738,7 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                  entries=entries,
                                  result_count=result_count,
                                  title=_(u"Search"),
-                                 page="search",
-                                 thumbnails=thumbnails)
+                                 page="search")
 
 
 # ################################### View Books list ##################################################################
@@ -973,10 +949,9 @@ def series_list():
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
                 .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
 
-            thumbnails = get_thumbnails_for_book_series(entries)
             return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
                                          title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
-                                         order=order_no, thumbnails=thumbnails)
+                                         order=order_no)
     else:
         abort(404)
 
@@ -1392,17 +1367,13 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     else:
         offset = 0
         limit_all = result_count
-
-    entries = q[offset:limit_all]
-    thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
-                                 entries=entries,
+                                 entries=q[offset:limit_all],
                                  result_count=result_count,
                                  title=_(u"Advanced Search"),
-                                 page="advsearch",
-                                 thumbnails=thumbnails)
+                                 page="advsearch")
 
 
 @web.route("/advsearch", methods=['GET'])
@@ -1417,21 +1388,11 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
+@web.route("/cover/<int:book_id>/<int:resolution>")
+@web.route("/cover/<int:book_id>/<int:resolution>/<string:cache_bust>")
 @login_required_if_no_ano
-def get_cover(book_id):
-    return get_book_cover(book_id)
-
-
-@web.route("/cached-cover/<string:cache_id>")
-@login_required_if_no_ano
-def get_cached_cover(cache_id):
-    return get_cached_book_cover(cache_id)
-
-
-@web.route("/cached-cover-thumbnail/<string:cache_id>")
-@login_required_if_no_ano
-def get_cached_cover_thumbnail(cache_id):
-    return get_cached_book_cover_thumbnail(cache_id)
+def get_cover(book_id, resolution=None, cache_bust=None):
+    return get_book_cover(book_id, resolution)
 
 
 @web.route("/robots.txt")
@@ -1841,7 +1802,6 @@ def show_book(book_id):
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
                 audioentries.append(media_format.format.lower())
 
-        thumbnails = get_thumbnails_for_books([entries])
         return render_title_template('detail.html',
                                      entry=entries,
                                      audioentries=audioentries,
@@ -1853,8 +1813,7 @@ def show_book(book_id):
                                      is_archived=is_archived,
                                      kindle_list=kindle_list,
                                      reader_list=reader_list,
-                                     page="book",
-                                     thumbnails=thumbnails)
+                                     page="book")
     else:
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),

From 0bd544704d2060efa544d176b582826838d306ec Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sat, 25 Sep 2021 03:04:38 -0500
Subject: [PATCH 017/220] Added series cover thumbnail generation. Better cache
 file handling.

---
 cps/admin.py                  |   2 +-
 cps/constants.py              |  13 ++
 cps/fs.py                     |  19 ++-
 cps/helper.py                 |  57 ++++++-
 cps/jinjia.py                 |  43 ++++--
 cps/schedule.py               |   3 +-
 cps/tasks/thumbnail.py        | 280 ++++++++++++++++++++++++++++++----
 cps/templates/author.html     |   2 +-
 cps/templates/book_cover.html |  11 --
 cps/templates/book_edit.html  |   4 +-
 cps/templates/detail.html     |   2 +-
 cps/templates/discover.html   |   4 +-
 cps/templates/fragment.html   |   2 +-
 cps/templates/grid.html       |   4 +-
 cps/templates/image.html      |  23 +++
 cps/templates/index.html      |   6 +-
 cps/templates/layout.html     |   2 +-
 cps/templates/search.html     |   4 +-
 cps/templates/shelf.html      |   4 +-
 cps/ub.py                     |   5 +-
 cps/web.py                    |  32 +++-
 21 files changed, 430 insertions(+), 92 deletions(-)
 delete mode 100644 cps/templates/book_cover.html
 create mode 100644 cps/templates/image.html

diff --git a/cps/admin.py b/cps/admin.py
index 98535320..92c8bd70 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -166,7 +166,7 @@ def clear_cache():
     cache_type = request.args.get('cache_type'.strip())
     showtext = {}
 
-    if cache_type == fs.CACHE_TYPE_THUMBNAILS:
+    if cache_type == constants.CACHE_TYPE_THUMBNAILS:
         log.info('clearing cover thumbnail cache')
         showtext['text'] = _(u'Cleared cover thumbnail cache')
         helper.clear_cover_thumbnail_cache()
diff --git a/cps/constants.py b/cps/constants.py
index 6a6b8f2b..306d2872 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -169,6 +169,19 @@ NIGHTLY_VERSION[1] = '$Format:%cI$'
 # NIGHTLY_VERSION[0] = 'bb7d2c6273ae4560e83950d36d64533343623a57'
 # NIGHTLY_VERSION[1] = '2018-09-09T10:13:08+02:00'
 
+# CACHE
+CACHE_TYPE_THUMBNAILS    = 'thumbnails'
+
+# Thumbnail Types
+THUMBNAIL_TYPE_COVER     = 1
+THUMBNAIL_TYPE_SERIES    = 2
+THUMBNAIL_TYPE_AUTHOR    = 3
+
+# Thumbnails Sizes
+COVER_THUMBNAIL_ORIGINAL = 0
+COVER_THUMBNAIL_SMALL    = 1
+COVER_THUMBNAIL_MEDIUM   = 2
+COVER_THUMBNAIL_LARGE    = 3
 
 # clean-up the module namespace
 del sys, os, namedtuple
diff --git a/cps/fs.py b/cps/fs.py
index 30ab552a..0171a5d5 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -19,12 +19,10 @@
 from __future__ import division, print_function, unicode_literals
 from . import logger
 from .constants import CACHE_DIR
-from os import listdir, makedirs, remove
+from os import makedirs, remove
 from os.path import isdir, isfile, join
 from shutil import rmtree
 
-CACHE_TYPE_THUMBNAILS = 'thumbnails'
-
 
 class FileSystem:
     _instance = None
@@ -54,8 +52,19 @@ class FileSystem:
 
         return path if cache_type else self._cache_dir
 
+    def get_cache_file_dir(self, filename, cache_type=None):
+        path = join(self.get_cache_dir(cache_type), filename[:2])
+        if not isdir(path):
+            try:
+                makedirs(path)
+            except OSError:
+                self.log.info(f'Failed to create path {path} (Permission denied).')
+                return False
+
+        return path
+
     def get_cache_file_path(self, filename, cache_type=None):
-        return join(self.get_cache_dir(cache_type), filename) if filename else None
+        return join(self.get_cache_file_dir(filename, cache_type), filename) if filename else None
 
     def get_cache_file_exists(self, filename, cache_type=None):
         path = self.get_cache_file_path(filename, cache_type)
@@ -78,7 +87,7 @@ class FileSystem:
                 return False
 
     def delete_cache_file(self, filename, cache_type=None):
-        path = join(self.get_cache_dir(cache_type), filename)
+        path = self.get_cache_file_path(filename, cache_type)
         if isfile(path):
             try:
                 remove(path)
diff --git a/cps/helper.py b/cps/helper.py
index 1652be23..2f2df0e0 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -55,7 +55,7 @@ from . import calibre_db
 from .tasks.convert import TaskConvert
 from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
-from .constants import STATIC_DIR as _STATIC_DIR
+from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
 from .tasks.mail import TaskEmail
@@ -575,8 +575,9 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
             thumbnail = get_book_cover_thumbnail(book, resolution)
             if thumbnail:
                 cache = fs.FileSystem()
-                if cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
-                    return send_from_directory(cache.get_cache_dir(fs.CACHE_TYPE_THUMBNAILS), thumbnail.filename)
+                if cache.get_cache_file_exists(thumbnail.filename, CACHE_TYPE_THUMBNAILS):
+                    return send_from_directory(cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS),
+                                               thumbnail.filename)
 
         # Send the book cover from Google Drive if configured
         if config.config_use_google_drive:
@@ -606,14 +607,54 @@ def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None)
 
 def get_book_cover_thumbnail(book, resolution):
     if book and book.has_cover:
-        return ub.session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id == book.id)\
-            .filter(ub.Thumbnail.resolution == resolution)\
-            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
+        return ub.session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == THUMBNAIL_TYPE_COVER) \
+            .filter(ub.Thumbnail.entity_id == book.id) \
+            .filter(ub.Thumbnail.resolution == resolution) \
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
             .first()
 
 
+def get_series_thumbnail_on_failure(series_id, resolution):
+    book = calibre_db.session \
+        .query(db.Books) \
+        .join(db.books_series_link) \
+        .join(db.Series) \
+        .filter(db.Series.id == series_id) \
+        .filter(db.Books.has_cover == 1) \
+        .first()
+
+    return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
+
+
+def get_series_cover_thumbnail(series_id, resolution=None):
+    return get_series_cover_internal(series_id, resolution)
+
+
+def get_series_cover_internal(series_id, resolution=None):
+    # Send the series thumbnail if it exists in cache
+    if resolution:
+        thumbnail = get_series_thumbnail(series_id, resolution)
+        if thumbnail:
+            cache = fs.FileSystem()
+            if cache.get_cache_file_exists(thumbnail.filename, CACHE_TYPE_THUMBNAILS):
+                return send_from_directory(cache.get_cache_file_dir(thumbnail.filename, CACHE_TYPE_THUMBNAILS),
+                                           thumbnail.filename)
+
+    return get_series_thumbnail_on_failure(series_id, resolution)
+
+
+def get_series_thumbnail(series_id, resolution):
+    return ub.session \
+        .query(ub.Thumbnail) \
+        .filter(ub.Thumbnail.type == THUMBNAIL_TYPE_SERIES) \
+        .filter(ub.Thumbnail.entity_id == series_id) \
+        .filter(ub.Thumbnail.resolution == resolution) \
+        .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
+        .first()
+
+
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
diff --git a/cps/jinjia.py b/cps/jinjia.py
index 8c8b72a9..1a58416a 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -32,9 +32,7 @@ from flask import Blueprint, request, url_for
 from flask_babel import get_locale
 from flask_login import current_user
 from markupsafe import escape
-from . import logger
-from .tasks.thumbnail import THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X
-
+from . import constants, logger
 
 jinjia = Blueprint('jinjia', __name__)
 log = logger.create()
@@ -141,17 +139,44 @@ def uuidfilter(var):
     return uuid4()
 
 
+@jinjia.app_template_filter('cache_timestamp')
+def cache_timestamp(rolling_period='month'):
+    if rolling_period == 'day':
+        return str(int(datetime.datetime.today().replace(hour=1, minute=1).timestamp()))
+    elif rolling_period == 'year':
+        return str(int(datetime.datetime.today().replace(day=1).timestamp()))
+    else:
+        return str(int(datetime.datetime.today().replace(month=1, day=1).timestamp()))
+
+
 @jinjia.app_template_filter('last_modified')
-def book_cover_cache_id(book):
-    timestamp = int(book.last_modified.timestamp() * 1000)
-    return str(timestamp)
+def book_last_modified(book):
+    return str(int(book.last_modified.timestamp()))
 
 
 @jinjia.app_template_filter('get_cover_srcset')
 def get_cover_srcset(book):
     srcset = list()
-    for resolution in [THUMBNAIL_RESOLUTION_1X, THUMBNAIL_RESOLUTION_2X, THUMBNAIL_RESOLUTION_3X]:
-        timestamp = int(book.last_modified.timestamp() * 1000)
-        url = url_for('web.get_cover', book_id=book.id, resolution=resolution, cache_bust=str(timestamp))
+    resolutions = {
+        constants.COVER_THUMBNAIL_SMALL: 'sm',
+        constants.COVER_THUMBNAIL_MEDIUM: 'md',
+        constants.COVER_THUMBNAIL_LARGE: 'lg'
+    }
+    for resolution, shortname in resolutions.items():
+        url = url_for('web.get_cover', book_id=book.id, resolution=shortname, c=book_last_modified(book))
+        srcset.append(f'{url} {resolution}x')
+    return ', '.join(srcset)
+
+
+@jinjia.app_template_filter('get_series_srcset')
+def get_cover_srcset(series):
+    srcset = list()
+    resolutions = {
+        constants.COVER_THUMBNAIL_SMALL: 'sm',
+        constants.COVER_THUMBNAIL_MEDIUM: 'md',
+        constants.COVER_THUMBNAIL_LARGE: 'lg'
+    }
+    for resolution, shortname in resolutions.items():
+        url = url_for('web.get_series_cover', series_id=series.id, resolution=shortname, c=cache_timestamp())
         srcset.append(f'{url} {resolution}x')
     return ', '.join(srcset)
diff --git a/cps/schedule.py b/cps/schedule.py
index 8c350bd5..dc153b9a 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -21,7 +21,7 @@ from __future__ import division, print_function, unicode_literals
 from .services.background_scheduler import BackgroundScheduler
 from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskGenerateCoverThumbnails
+from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
 
 
 def register_jobs():
@@ -37,3 +37,4 @@ def register_jobs():
 
 def register_startup_jobs():
     WorkerThread.add(None, TaskGenerateCoverThumbnails())
+    # WorkerThread.add(None, TaskGenerateSeriesThumbnails())
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 688f6e4b..152b8772 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -19,10 +19,11 @@
 from __future__ import division, print_function, unicode_literals
 import os
 
+from .. import constants
 from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask
 from datetime import datetime, timedelta
-from sqlalchemy import or_
+from sqlalchemy import func, text, or_
 
 try:
     from urllib.request import urlopen
@@ -35,9 +36,34 @@ try:
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
-THUMBNAIL_RESOLUTION_1X = 1
-THUMBNAIL_RESOLUTION_2X = 2
-THUMBNAIL_RESOLUTION_3X = 3
+
+def get_resize_height(resolution):
+    return int(225 * resolution)
+
+
+def get_resize_width(resolution, original_width, original_height):
+    height = get_resize_height(resolution)
+    percent = (height / float(original_height))
+    width = int((float(original_width) * float(percent)))
+    return width if width % 2 == 0 else width + 1
+
+
+def get_best_fit(width, height, image_width, image_height):
+    resize_width = int(width / 2.0)
+    resize_height = int(height / 2.0)
+    aspect_ratio = image_width / image_height
+
+    # If this image's aspect ratio is different than the first image, then resize this image
+    # to fill the width and height of the first image
+    if aspect_ratio < width / height:
+        resize_width = int(width / 2.0)
+        resize_height = image_height * int(width / 2.0) / image_width
+
+    elif aspect_ratio > width / height:
+        resize_width = image_width * int(height / 2.0) / image_height
+        resize_height = int(height / 2.0)
+
+    return {'width': resize_width, 'height': resize_height}
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
@@ -48,8 +74,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
         self.cache = fs.FileSystem()
         self.resolutions = [
-            THUMBNAIL_RESOLUTION_1X,
-            THUMBNAIL_RESOLUTION_2X
+            constants.COVER_THUMBNAIL_SMALL,
+            constants.COVER_THUMBNAIL_MEDIUM
         ]
 
     def run(self, worker_thread):
@@ -75,7 +101,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                         updated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
-                    elif not self.cache.get_cache_file_exists(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS):
+                    elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
                         updated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
@@ -86,21 +112,23 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.app_db_session.remove()
 
     def get_books_with_covers(self):
-        return self.calibre_db.session\
-            .query(db.Books)\
-            .filter(db.Books.has_cover == 1)\
+        return self.calibre_db.session \
+            .query(db.Books) \
+            .filter(db.Books.has_cover == 1) \
             .all()
 
     def get_book_cover_thumbnails(self, book_id):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id == book_id)\
-            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow()))\
+        return self.app_db_session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER) \
+            .filter(ub.Thumbnail.entity_id == book_id) \
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
             .all()
 
     def create_book_cover_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
-        thumbnail.book_id = book.id
+        thumbnail.type = constants.THUMBNAIL_TYPE_COVER
+        thumbnail.entity_id = book.id
         thumbnail.format = 'jpeg'
         thumbnail.resolution = resolution
 
@@ -118,7 +146,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
         try:
             self.app_db_session.commit()
-            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+            self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
             self.log.info(u'Error updating book thumbnail: ' + str(ex))
@@ -144,7 +172,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                             width = self.get_thumbnail_width(height, img)
                             img.resize(width=width, height=height, filter='lanczos')
                             img.format = thumbnail.format
-                            filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                            filename = self.cache.get_cache_file_path(thumbnail.filename,
+                                                                      constants.CACHE_TYPE_THUMBNAILS)
                             img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
@@ -158,26 +187,212 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     raise Exception('Book cover file not found')
 
                 with Image(filename=book_cover_filepath) as img:
-                    height = self.get_thumbnail_height(thumbnail)
+                    height = get_resize_height(thumbnail.resolution)
                     if img.height > height:
-                        width = self.get_thumbnail_width(height, img)
+                        width = get_resize_width(thumbnail.resolution, img.width, img.height)
                         img.resize(width=width, height=height, filter='lanczos')
                         img.format = thumbnail.format
-                        filename = self.cache.get_cache_file_path(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+                        filename = self.cache.get_cache_file_path(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
                         img.save(filename=filename)
 
-    def get_thumbnail_height(self, thumbnail):
-        return int(225 * thumbnail.resolution)
-
-    def get_thumbnail_width(self, height, img):
-        percent = (height / float(img.height))
-        return int((float(img.width) * float(percent)))
-
     @property
     def name(self):
         return "ThumbnailsGenerate"
 
 
+class TaskGenerateSeriesThumbnails(CalibreTask):
+    def __init__(self, task_message=u'Generating series thumbnails'):
+        super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
+        self.log = logger.create()
+        self.app_db_session = ub.get_new_session_instance()
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.cache = fs.FileSystem()
+        self.resolutions = [
+            constants.COVER_THUMBNAIL_SMALL,
+            constants.COVER_THUMBNAIL_MEDIUM
+        ]
+
+    # get all series
+    # get all books in series with covers and count >= 4 books
+    # get the dimensions from the first book in the series & pop the first book from the series list of books
+    # randomly select three other books in the series
+
+    # resize the covers in the sequence?
+    # create an image sequence from the 4 selected books of the series
+    # join pairs of books in the series with wand's concat
+    # join the two sets of pairs with wand's
+
+    def run(self, worker_thread):
+        if self.calibre_db.session and use_IM:
+            all_series = self.get_series_with_four_plus_books()
+            count = len(all_series)
+
+            updated = 0
+            generated = 0
+            for i, series in enumerate(all_series):
+                series_thumbnails = self.get_series_thumbnails(series.id)
+                series_books = self.get_series_books(series.id)
+
+                # Generate new thumbnails for missing covers
+                resolutions = list(map(lambda t: t.resolution, series_thumbnails))
+                missing_resolutions = list(set(self.resolutions).difference(resolutions))
+                for resolution in missing_resolutions:
+                    generated += 1
+                    self.create_series_thumbnail(series, series_books, resolution)
+
+                # Replace outdated or missing thumbnails
+                for thumbnail in series_thumbnails:
+                    if any(book.last_modified > thumbnail.generated_at for book in series_books):
+                        updated += 1
+                        self.update_series_thumbnail(series_books, thumbnail)
+
+                    elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
+                        updated += 1
+                        self.update_series_thumbnail(series_books, thumbnail)
+
+                self.message = u'Processing series {0} of {1}'.format(i + 1, count)
+                self.progress = (1.0 / count) * i
+
+        self._handleSuccess()
+        self.app_db_session.remove()
+
+    def get_series_with_four_plus_books(self):
+        return self.calibre_db.session \
+            .query(db.Series) \
+            .join(db.books_series_link) \
+            .join(db.Books) \
+            .filter(db.Books.has_cover == 1) \
+            .group_by(text('books_series_link.series')) \
+            .having(func.count('book_series_link') > 3) \
+            .all()
+
+    def get_series_books(self, series_id):
+        return self.calibre_db.session \
+            .query(db.Books) \
+            .join(db.books_series_link) \
+            .join(db.Series) \
+            .filter(db.Books.has_cover == 1) \
+            .filter(db.Series.id == series_id) \
+            .all()
+
+    def get_series_thumbnails(self, series_id):
+        return self.app_db_session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_SERIES) \
+            .filter(ub.Thumbnail.entity_id == series_id) \
+            .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
+            .all()
+
+    def create_series_thumbnail(self, series, series_books, resolution):
+        thumbnail = ub.Thumbnail()
+        thumbnail.type = constants.THUMBNAIL_TYPE_SERIES
+        thumbnail.entity_id = series.id
+        thumbnail.format = 'jpeg'
+        thumbnail.resolution = resolution
+
+        self.app_db_session.add(thumbnail)
+        try:
+            self.app_db_session.commit()
+            self.generate_series_thumbnail(series_books, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error creating book thumbnail: ' + str(ex))
+            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def update_series_thumbnail(self, series_books, thumbnail):
+        thumbnail.generated_at = datetime.utcnow()
+
+        try:
+            self.app_db_session.commit()
+            self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
+            self.generate_series_thumbnail(series_books, thumbnail)
+        except Exception as ex:
+            self.log.info(u'Error updating book thumbnail: ' + str(ex))
+            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.app_db_session.rollback()
+
+    def generate_series_thumbnail(self, series_books, thumbnail):
+        books = series_books[:4]
+
+        top = 0
+        left = 0
+        width = 0
+        height = 0
+        with Image() as canvas:
+            for book in books:
+                if config.config_use_google_drive:
+                    if not gdriveutils.is_gdrive_ready():
+                        raise Exception('Google Drive is configured but not ready')
+
+                    web_content_link = gdriveutils.get_cover_via_gdrive(book.path)
+                    if not web_content_link:
+                        raise Exception('Google Drive cover url not found')
+
+                    stream = None
+                    try:
+                        stream = urlopen(web_content_link)
+                        with Image(file=stream) as img:
+                            # Use the first image in this set to determine the width and height to scale the
+                            # other images in this set
+                            if width == 0 or height == 0:
+                                width = get_resize_width(thumbnail.resolution, img.width, img.height)
+                                height = get_resize_height(thumbnail.resolution)
+                                canvas.blank(width, height)
+
+                            dimensions = get_best_fit(width, height, img.width, img.height)
+
+                            # resize and crop the image
+                            img.resize(width=int(dimensions['width']), height=int(dimensions['height']), filter='lanczos')
+                            img.crop(width=int(width / 2.0), height=int(height / 2.0), gravity='center')
+
+                            # add the image to the canvas
+                            canvas.composite(img, left, top)
+
+                    except Exception as ex:
+                        self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                        raise ex
+                    finally:
+                        stream.close()
+
+                book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
+                if not os.path.isfile(book_cover_filepath):
+                    raise Exception('Book cover file not found')
+
+                with Image(filename=book_cover_filepath) as img:
+                    # Use the first image in this set to determine the width and height to scale the
+                    # other images in this set
+                    if width == 0 or height == 0:
+                        width = get_resize_width(thumbnail.resolution, img.width, img.height)
+                        height = get_resize_height(thumbnail.resolution)
+                        canvas.blank(width, height)
+
+                    dimensions = get_best_fit(width, height, img.width, img.height)
+
+                    # resize and crop the image
+                    img.resize(width=int(dimensions['width']), height=int(dimensions['height']), filter='lanczos')
+                    img.crop(width=int(width / 2.0), height=int(height / 2.0), gravity='center')
+
+                    # add the image to the canvas
+                    canvas.composite(img, left, top)
+
+                # set the coordinates for the next iteration
+                if left == 0 and top == 0:
+                    left = int(width / 2.0)
+                elif left == int(width / 2.0) and top == 0:
+                    left = 0
+                    top = int(height / 2.0)
+                else:
+                    left = int(width / 2.0)
+
+            canvas.format = thumbnail.format
+            filename = self.cache.get_cache_file_path(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
+            canvas.save(filename=filename)
+
+    @property
+    def name(self):
+        return "SeriesThumbnailGenerate"
+
+
 class TaskClearCoverThumbnailCache(CalibreTask):
     def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
@@ -199,21 +414,22 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         self.app_db_session.remove()
 
     def get_thumbnails_for_book(self, book_id):
-        return self.app_db_session\
-            .query(ub.Thumbnail)\
-            .filter(ub.Thumbnail.book_id == book_id)\
+        return self.app_db_session \
+            .query(ub.Thumbnail) \
+            .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER) \
+            .filter(ub.Thumbnail.entity_id == book_id) \
             .all()
 
     def delete_thumbnail(self, thumbnail):
         try:
-            self.cache.delete_cache_file(thumbnail.filename, fs.CACHE_TYPE_THUMBNAILS)
+            self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnail: ' + str(ex))
             self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
     def delete_all_thumbnails(self):
         try:
-            self.cache.delete_cache_dir(fs.CACHE_TYPE_THUMBNAILS)
+            self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnails: ' + str(ex))
             self._handleError(u'Error deleting book thumbnails: ' + str(ex))
diff --git a/cps/templates/author.html b/cps/templates/author.html
index 2ff1ce7a..df891d5b 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,7 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img">
-              {{ book_cover_image(entry, title=author.name|safe) }}
+              {{ image.book_cover(entry, title=author.name|safe) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
deleted file mode 100644
index 7d3a84f4..00000000
--- a/cps/templates/book_cover.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% macro book_cover_image(book, title=None) -%}
-    {%- set book_title = book.title if book.title else book.name -%}
-    {%- set book_title = title if title else book_title -%}
-    {% set srcset = book|get_cover_srcset %}
-    <img
-        srcset="{{ srcset }}"
-        src="{{ url_for('web.get_cover', book_id=book.id, resolution=0, cache_bust=book|last_modified) }}"
-        title="{{ book_title }}"
-        alt="{{ book_title }}"
-    />
-{%- endmacro %}
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 8525b8e3..b5f5df7a 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,10 +1,10 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ book_cover_image(book) }}
+        {{ image.book_cover(book) }}
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index b538ff9a..7985691a 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ book_cover_image(entry) }}
+          {{ image.book_cover(entry) }}
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 01cd393d..d697ff0a 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover load-more">
@@ -10,7 +10,7 @@
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-              {{ book_cover_image(entry) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/fragment.html b/cps/templates/fragment.html
index 901dd193..f2e94fb2 100644
--- a/cps/templates/fragment.html
+++ b/cps/templates/fragment.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 <div class="container-fluid">
   {% block body %}{% endblock %}
 </div>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 45fb53bf..b3395fcb 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <h1 class="{{page}}">{{_(title)}}</h1>
@@ -29,7 +29,7 @@
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}">
                           <span class="img">
-                              {{ book_cover_image(entry[0], title=entry[0].series[0].name|shortentitle) }}
+                              {{ image.series(entry[0].series[0], title=entry[0].series[0].name|shortentitle) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/image.html b/cps/templates/image.html
new file mode 100644
index 00000000..ae57727b
--- /dev/null
+++ b/cps/templates/image.html
@@ -0,0 +1,23 @@
+{% macro book_cover(book, title=None, alt=None) -%}
+    {%- set image_title = book.title if book.title else book.name -%}
+    {%- set image_title = title if title else image_title -%}
+    {%- set image_alt = alt if alt else image_title -%}
+    {% set srcset = book|get_cover_srcset %}
+    <img
+        srcset="{{ srcset }}"
+        src="{{ url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified) }}"
+        title="{{ image_title }}"
+        alt="{{ image_alt }}"
+    />
+{%- endmacro %}
+
+{% macro series(series, title=None, alt=None) -%}
+    {%- set image_alt = alt if alt else image_title -%}
+    {% set srcset = series|get_series_srcset %}
+    <img
+        srcset="{{ srcset }}"
+        src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='month'|cache_timestamp) }}"
+        title="{{ title }}"
+        alt="{{ book_title }}"
+    />
+{%- endmacro %}
diff --git a/cps/templates/index.html b/cps/templates/index.html
index e47c6c70..709d6ce7 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if g.user.show_detail_random() %}
@@ -10,7 +10,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img">
-                {{ book_cover_image(entry) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -87,7 +87,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-              {{ book_cover_image(entry) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 63dc7469..4a664ec1 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -1,5 +1,5 @@
 {% from 'modal_dialogs.html' import restrict_modal, delete_book, filechooser_modal, delete_confirm_modal, change_confirm_modal %}
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 <!DOCTYPE html>
 <html lang="{{ g.user.locale }}">
   <head>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 872b6dc1..15ff344f 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -45,7 +45,7 @@
         {% if entry.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img">
-                {{ book_cover_image(entry) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 0e5865c9..18dbde8b 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -1,4 +1,4 @@
-{% from 'book_cover.html' import book_cover_image %}
+{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 <div class="discover">
@@ -32,7 +32,7 @@
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img">
-                {{ book_cover_image(entry) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
diff --git a/cps/ub.py b/cps/ub.py
index f108a1ce..7666f0f2 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -526,10 +526,11 @@ class Thumbnail(Base):
     __tablename__ = 'thumbnail'
 
     id = Column(Integer, primary_key=True)
-    book_id = Column(Integer)
+    entity_id = Column(Integer)
     uuid = Column(String, default=lambda: str(uuid.uuid4()), unique=True)
     format = Column(String, default='jpeg')
-    resolution = Column(SmallInteger, default=1)
+    type = Column(SmallInteger, default=constants.THUMBNAIL_TYPE_COVER)
+    resolution = Column(SmallInteger, default=constants.COVER_THUMBNAIL_SMALL)
     filename = Column(String, default=filename)
     generated_at = Column(DateTime, default=lambda: datetime.datetime.utcnow())
     expiration = Column(DateTime, nullable=True)
diff --git a/cps/web.py b/cps/web.py
index 8f78ff32..88a5c0ab 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,8 +50,8 @@ from . import constants, logger, isoLanguages, services
 from . import babel, db, ub, config, get_locale, app
 from . import calibre_db
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import check_valid_domain, render_task_status, check_email, check_username, \
-    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
+from .helper import check_valid_domain, render_task_status, check_email, check_username, get_cc_columns, \
+    get_book_cover, get_series_cover_thumbnail, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email
 from .pagination import Pagination
 from .redirect import redirect_back
@@ -1388,11 +1388,31 @@ def advanced_search_form():
 
 
 @web.route("/cover/<int:book_id>")
-@web.route("/cover/<int:book_id>/<int:resolution>")
-@web.route("/cover/<int:book_id>/<int:resolution>/<string:cache_bust>")
+@web.route("/cover/<int:book_id>/<string:resolution>")
 @login_required_if_no_ano
-def get_cover(book_id, resolution=None, cache_bust=None):
-    return get_book_cover(book_id, resolution)
+def get_cover(book_id, resolution=None):
+    resolutions = {
+        'og': constants.COVER_THUMBNAIL_ORIGINAL,
+        'sm': constants.COVER_THUMBNAIL_SMALL,
+        'md': constants.COVER_THUMBNAIL_MEDIUM,
+        'lg': constants.COVER_THUMBNAIL_LARGE,
+    }
+    cover_resolution = resolutions.get(resolution, None)
+    return get_book_cover(book_id, cover_resolution)
+
+
+@web.route("/series_cover/<int:series_id>")
+@web.route("/series_cover/<int:series_id>/<string:resolution>")
+@login_required_if_no_ano
+def get_series_cover(series_id, resolution=None):
+    resolutions = {
+        'og': constants.COVER_THUMBNAIL_ORIGINAL,
+        'sm': constants.COVER_THUMBNAIL_SMALL,
+        'md': constants.COVER_THUMBNAIL_MEDIUM,
+        'lg': constants.COVER_THUMBNAIL_LARGE,
+    }
+    cover_resolution = resolutions.get(resolution, None)
+    return get_series_cover_thumbnail(series_id, cover_resolution)
 
 
 @web.route("/robots.txt")

From 26071d4e7ad1943f91904804fc1b5464866d748b Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Sun, 26 Sep 2021 02:02:48 -0500
Subject: [PATCH 018/220] Added Scheduled Tasks Settings

---
 cps/admin.py                         | 62 +++++++++++++++++++---------
 cps/config_sql.py                    | 15 +++++--
 cps/schedule.py                      | 19 +++++----
 cps/services/background_scheduler.py | 24 +++++++----
 cps/tasks/thumbnail.py               | 14 +------
 cps/templates/admin.html             | 43 +++++++++++--------
 cps/templates/schedule_edit.html     | 38 +++++++++++++++++
 7 files changed, 147 insertions(+), 68 deletions(-)
 create mode 100644 cps/templates/schedule_edit.html

diff --git a/cps/admin.py b/cps/admin.py
index 92c8bd70..bd292ba3 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -159,23 +159,6 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
-@admi.route("/clear-cache")
-@login_required
-@admin_required
-def clear_cache():
-    cache_type = request.args.get('cache_type'.strip())
-    showtext = {}
-
-    if cache_type == constants.CACHE_TYPE_THUMBNAILS:
-        log.info('clearing cover thumbnail cache')
-        showtext['text'] = _(u'Cleared cover thumbnail cache')
-        helper.clear_cover_thumbnail_cache()
-        return json.dumps(showtext)
-
-    showtext['text'] = _(u'Unknown command')
-    return json.dumps(showtext)
-
-
 @admi.route("/admin/view")
 @login_required
 @admin_required
@@ -205,6 +188,7 @@ def admin():
                                  feature_support=feature_support, kobo_support=kobo_support,
                                  title=_(u"Admin page"), page="admin")
 
+
 @admi.route("/admin/dbconfig", methods=["GET", "POST"])
 @login_required
 @admin_required
@@ -245,6 +229,7 @@ def ajax_db_config():
 def calibreweb_alive():
     return "", 200
 
+
 @admi.route("/admin/viewconfig")
 @login_required
 @admin_required
@@ -257,6 +242,7 @@ def view_configuration():
                                  restrictColumns=restrict_columns,
                                  title=_(u"UI Configuration"), page="uiconfig")
 
+
 @admi.route("/admin/usertable")
 @login_required
 @admin_required
@@ -339,6 +325,7 @@ def list_users():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @admi.route("/ajax/deleteuser", methods=['POST'])
 @login_required
 @admin_required
@@ -372,6 +359,7 @@ def delete_user():
     success.extend(errors)
     return Response(json.dumps(success), mimetype='application/json')
 
+
 @admi.route("/ajax/getlocale")
 @login_required
 @admin_required
@@ -517,6 +505,7 @@ def update_table_settings():
         return "Invalid request", 400
     return ""
 
+
 def check_valid_read_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -524,6 +513,7 @@ def check_valid_read_column(column):
             return False
     return True
 
+
 def check_valid_restricted_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -532,7 +522,6 @@ def check_valid_restricted_column(column):
     return True
 
 
-
 @admi.route("/admin/viewconfig", methods=["POST"])
 @login_required
 @admin_required
@@ -564,7 +553,6 @@ def update_view_configuration():
     _config_int(to_save, "config_books_per_page")
     _config_int(to_save, "config_authors_max")
 
-
     config.config_default_role = constants.selected_roles(to_save)
     config.config_default_role &= ~constants.ROLE_ANONYMOUS
 
@@ -1210,6 +1198,7 @@ def _db_configuration_update_helper():
     config.save()
     return _db_configuration_result(None, gdrive_error)
 
+
 def _configuration_update_helper():
     reboot_required = False
     to_save = request.form.to_dict()
@@ -1299,6 +1288,7 @@ def _configuration_update_helper():
 
     return _configuration_result(None, reboot_required)
 
+
 def _configuration_result(error_flash=None, reboot=False):
     resp = {}
     if error_flash:
@@ -1388,6 +1378,7 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
         log.error("Settings DB is not Writeable")
         flash(_("Settings DB is not Writeable"), category="error")
 
+
 def _delete_user(content):
     if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
                                         ub.User.id != content.id).count():
@@ -1572,6 +1563,39 @@ def update_mailsettings():
     return edit_mailsettings()
 
 
+@admi.route("/admin/scheduledtasks")
+@login_required
+@admin_required
+def edit_scheduledtasks():
+    content = config.get_scheduled_task_settings()
+    return render_title_template("schedule_edit.html", content=content, title=_(u"Edit Scheduled Tasks Settings"))
+
+
+@admi.route("/admin/scheduledtasks", methods=["POST"])
+@login_required
+@admin_required
+def update_scheduledtasks():
+    to_save = request.form.to_dict()
+    _config_int(to_save, "schedule_start_time")
+    _config_int(to_save, "schedule_end_time")
+    _config_checkbox(to_save, "schedule_generate_book_covers")
+    _config_checkbox(to_save, "schedule_generate_series_covers")
+
+    try:
+        config.save()
+        flash(_(u"Scheduled tasks settings updated"), category="success")
+    except IntegrityError as ex:
+        ub.session.rollback()
+        log.error("An unknown error occurred while saving scheduled tasks settings")
+        flash(_(u"An unknown error occurred. Please try again later."), category="error")
+    except OperationalError:
+        ub.session.rollback()
+        log.error("Settings DB is not Writeable")
+        flash(_("Settings DB is not Writeable"), category="error")
+
+    return edit_scheduledtasks()
+
+
 @admi.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
 @login_required
 @admin_required
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 88107f9b..4841f03d 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -133,13 +133,18 @@ class _Settings(_Base):
     config_calibre = Column(String)
     config_rarfile_location = Column(String, default=None)
     config_upload_formats = Column(String, default=','.join(constants.EXTENSIONS_UPLOAD))
-    config_unicode_filename =Column(Boolean, default=False)
+    config_unicode_filename = Column(Boolean, default=False)
 
     config_updatechannel = Column(Integer, default=constants.UPDATE_STABLE)
 
     config_reverse_proxy_login_header_name = Column(String)
     config_allow_reverse_proxy_header_login = Column(Boolean, default=False)
 
+    schedule_start_time = Column(Integer, default=4)
+    schedule_end_time = Column(Integer, default=6)
+    schedule_generate_book_covers = Column(Boolean, default=False)
+    schedule_generate_series_covers = Column(Boolean, default=False)
+
     def __repr__(self):
         return self.__class__.__name__
 
@@ -170,7 +175,6 @@ class _ConfigSQL(object):
         if change:
             self.save()
 
-
     def _read_from_storage(self):
         if self._settings is None:
             log.debug("_ConfigSQL._read_from_storage")
@@ -254,6 +258,8 @@ class _ConfigSQL(object):
         return bool((self.mail_server != constants.DEFAULT_MAIL_SERVER and self.mail_server_type == 0)
                     or (self.mail_gmail_token != {} and self.mail_server_type == 1))
 
+    def get_scheduled_task_settings(self):
+        return {k:v for k, v in self.__dict__.items() if k.startswith('schedule_')}
 
     def set_from_dictionary(self, dictionary, field, convertor=None, default=None, encode=None):
         """Possibly updates a field of this object.
@@ -289,7 +295,6 @@ class _ConfigSQL(object):
                 storage[k] = v
         return storage
 
-
     def load(self):
         '''Load all configuration values from the underlying storage.'''
         s = self._read_from_storage()  # type: _Settings
@@ -407,6 +412,7 @@ def autodetect_calibre_binary():
             return element
     return ""
 
+
 def autodetect_unrar_binary():
     if sys.platform == "win32":
         calibre_path = ["C:\\program files\\WinRar\\unRAR.exe",
@@ -418,6 +424,7 @@ def autodetect_unrar_binary():
             return element
     return ""
 
+
 def autodetect_kepubify_binary():
     if sys.platform == "win32":
         calibre_path = ["C:\\program files\\kepubify\\kepubify-windows-64Bit.exe",
@@ -429,6 +436,7 @@ def autodetect_kepubify_binary():
             return element
     return ""
 
+
 def _migrate_database(session):
     # make sure the table is created, if it does not exist
     _Base.metadata.create_all(session.bind)
@@ -452,6 +460,7 @@ def load_configuration(session):
     #    session.commit()
     return conf
 
+
 def get_flask_session_key(session):
     flask_settings = session.query(_Flask_Settings).one_or_none()
     if flask_settings == None:
diff --git a/cps/schedule.py b/cps/schedule.py
index dc153b9a..2cddaecb 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -19,7 +19,6 @@
 from __future__ import division, print_function, unicode_literals
 
 from .services.background_scheduler import BackgroundScheduler
-from .services.worker import WorkerThread
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
 
@@ -28,13 +27,19 @@ def register_jobs():
     scheduler = BackgroundScheduler()
 
     if scheduler:
-        # Reconnect metadata.db once every 12 hours
-        scheduler.add_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
+        # Reconnect Calibre database (metadata.db)
+        scheduler.schedule_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
 
-        # Generate all missing book cover thumbnails once every 24 hours
-        scheduler.add_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+        # Generate all missing book cover thumbnails
+        scheduler.schedule_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+
+        # Generate all missing series thumbnails
+        scheduler.schedule_task(user=None, task=lambda: TaskGenerateSeriesThumbnails(), trigger='cron', hour=4)
 
 
 def register_startup_jobs():
-    WorkerThread.add(None, TaskGenerateCoverThumbnails())
-    # WorkerThread.add(None, TaskGenerateSeriesThumbnails())
+    scheduler = BackgroundScheduler()
+
+    if scheduler:
+        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateCoverThumbnails())
+        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateSeriesThumbnails())
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 1b588ac2..ba578903 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -40,25 +40,31 @@ class BackgroundScheduler:
 
         if cls._instance is None:
             cls._instance = super(BackgroundScheduler, cls).__new__(cls)
-
-            scheduler = BScheduler()
-            atexit.register(lambda: scheduler.shutdown())
-
             cls.log = logger.create()
-            cls.scheduler = scheduler
+            cls.scheduler = BScheduler()
             cls.scheduler.start()
 
+            atexit.register(lambda: cls.scheduler.shutdown())
+
         return cls._instance
 
-    def add(self, func, trigger, **trigger_args):
+    def _add(self, func, trigger, **trigger_args):
         if use_APScheduler:
             return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
-    def add_task(self, user, task, trigger, **trigger_args):
+    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
+    def schedule_task(self, user, task, trigger, **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
-                self.log.info(f'Running scheduled task in background: {worker_task.name} - {worker_task.message}')
                 WorkerThread.add(user, worker_task)
 
-            return self.add(func=scheduled_task, trigger=trigger, **trigger_args)
+            return self._add(func=scheduled_task, trigger=trigger, **trigger_args)
+
+    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
+    def schedule_task_immediately(self, user, task):
+        if use_APScheduler:
+            def scheduled_task():
+                WorkerThread.add(user, task())
+
+            return self._add(func=scheduled_task, trigger='date')
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 152b8772..a220fd8c 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -167,9 +167,9 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                 try:
                     stream = urlopen(web_content_link)
                     with Image(file=stream) as img:
-                        height = self.get_thumbnail_height(thumbnail)
+                        height = get_resize_height(thumbnail.resolution)
                         if img.height > height:
-                            width = self.get_thumbnail_width(height, img)
+                            width = get_resize_width(thumbnail.resolution, img.width, img.height)
                             img.resize(width=width, height=height, filter='lanczos')
                             img.format = thumbnail.format
                             filename = self.cache.get_cache_file_path(thumbnail.filename,
@@ -212,16 +212,6 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             constants.COVER_THUMBNAIL_MEDIUM
         ]
 
-    # get all series
-    # get all books in series with covers and count >= 4 books
-    # get the dimensions from the first book in the series & pop the first book from the series list of books
-    # randomly select three other books in the series
-
-    # resize the covers in the sequence?
-    # create an image sequence from the 4 selected books of the series
-    # join pairs of books in the series with wand's concat
-    # join the two sets of pairs with wand's
-
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM:
             all_series = self.get_series_with_four_plus_books()
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 597ba103..ec0fc84e 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -156,6 +156,31 @@
     </div>
   </div>
 
+  <div class="row">
+    <div class="col">
+      <h2>{{_('Scheduled Tasks')}}</h2>
+        <div class="col-xs-12 col-sm-12">
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Time at which tasks start to run')}}</div>
+            <div class="col-xs-6 col-sm-3">{{config.schedule_start_time}}:00</div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Time at which tasks stop running')}}</div>
+            <div class="col-xs-6 col-sm-3">{{config.schedule_end_time}}:00</div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Generate book cover thumbnails')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_book_covers) }}</div>
+          </div>
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Generate series cover thumbnails')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_series_covers) }}</div>
+          </div>
+        </div>
+      <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
+    </div>
+  </div>
+
   <div class="row form-group">
     <h2>{{_('Administration')}}</h2>
     <a class="btn btn-default" id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a>
@@ -163,7 +188,6 @@
   </div>
   <div class="row form-group">
     <div class="btn btn-default" id="restart_database" data-toggle="modal" data-target="#StatusDialog">{{_('Reconnect Calibre Database')}}</div>
-    <div class="btn btn-default" id="clear_cover_thumbnail_cache" data-toggle="modal" data-target="#ClearCacheDialog">{{_('Clear Cover Thumbnail Cache')}}</div>
   </div>
   <div class="row form-group">
     <div class="btn btn-default" id="admin_restart" data-toggle="modal" data-target="#RestartDialog">{{_('Restart')}}</div>
@@ -248,21 +272,4 @@
     </div>
   </div>
 </div>
-<div id="ClearCacheDialog" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-sm">
-    <!-- Modal content-->
-    <div class="modal-content">
-      <div class="modal-header bg-info"></div>
-      <div class="modal-body text-center">
-        <p>{{_('Are you sure you want to clear the cover thumbnail cache?')}}</p>
-        <div id="spinner3" class="spinner" style="display:none;">
-          <img id="img-spinner3" src="{{ url_for('static', filename='css/libs/images/loading-icon.gif') }}"/>
-        </div>
-        <p></p>
-        <button type="button" class="btn btn-default" id="clear_cache" >{{_('OK')}}</button>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
-      </div>
-    </div>
-  </div>
-</div>
 {% endblock %}
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
new file mode 100644
index 00000000..f4e72224
--- /dev/null
+++ b/cps/templates/schedule_edit.html
@@ -0,0 +1,38 @@
+{% extends "layout.html" %}
+{% block header %}
+<link href="{{ url_for('static', filename='css/libs/bootstrap-table.min.css') }}" rel="stylesheet">
+<link href="{{ url_for('static', filename='css/libs/bootstrap-editable.css') }}" rel="stylesheet">
+{% endblock %}
+{% block body %}
+<div class="discover">
+  <h1>{{title}}</h1>
+  <form role="form" class="col-md-10 col-lg-6" method="POST" autocomplete="off">
+    <div class="form-group">
+      <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
+      <select name="schedule_start_time" id="schedule_start_time" class="form-control">
+        {% for n in range(24) %}
+          <option value="{{n}}" {% if content.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+        {% endfor %}
+      </select>
+    </div>
+    <div class="form-group">
+      <label for="schedule_end_time">{{_('Time at which tasks stop running')}}</label>
+      <select name="schedule_end_time" id="schedule_end_time" class="form-control">
+        {% for n in range(24) %}
+          <option value="{{n}}" {% if content.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+        {% endfor %}
+      </select>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" checked>
+      <label for="schedule_generate_book_covers">{{_('Generate Book Cover Thumbnails')}}</label>
+    </div>
+    <div class="form-group">
+      <input type="checkbox" id="schedule_generate_series_covers" name="schedule_generate_series_covers" {% if config.schedule_generate_series_covers %}checked{% endif %}>
+      <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
+    </div>
+    <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
+    <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Cancel')}}</a>
+  </form>
+</div>
+{% endblock %}

From 46205a1f83ec6a81c57d5dd3348ea583f9201063 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 29 Sep 2021 02:40:12 -0500
Subject: [PATCH 019/220] Made long running tasks cancellable. Added cancel
 button to cancellable tasks in the task list. Added APP_MODE env variable for
 determining if the app is running in development, test, or production.

---
 cps.py                               |   8 +-
 cps/admin.py                         |  23 +++++-
 cps/constants.py                     |   7 +-
 cps/db.py                            |   6 +-
 cps/helper.py                        |  17 +++-
 cps/schedule.py                      |  61 ++++++++++++---
 cps/services/background_scheduler.py |  35 ++++++---
 cps/services/worker.py               |  35 +++++++--
 cps/static/css/caliBlur.css          |  93 +++++++++-------------
 cps/static/js/main.js                |  12 ---
 cps/static/js/table.js               |  34 +++++++-
 cps/tasks/convert.py                 |   4 +
 cps/tasks/database.py                |   4 +
 cps/tasks/mail.py                    |   6 +-
 cps/tasks/thumbnail.py               | 111 +++++++++++++++++++--------
 cps/tasks/upload.py                  |   4 +
 cps/templates/admin.html             |   2 +-
 cps/templates/schedule_edit.html     |   6 +-
 cps/templates/tasks.html             |  27 +++++++
 cps/web.py                           |   4 +-
 20 files changed, 346 insertions(+), 153 deletions(-)

diff --git a/cps.py b/cps.py
index fe006551..20a27c71 100755
--- a/cps.py
+++ b/cps.py
@@ -44,7 +44,7 @@ from cps.editbooks import editbook
 from cps.remotelogin import remotelogin
 from cps.search_metadata import meta
 from cps.error_handler import init_errorhandler
-from cps.schedule import register_jobs, register_startup_jobs
+from cps.schedule import register_scheduled_tasks, register_startup_tasks
 
 try:
     from cps.kobo import kobo, get_kobo_activated
@@ -81,9 +81,9 @@ def main():
     if oauth_available:
         app.register_blueprint(oauth)
 
-    # Register scheduled jobs
-    register_jobs()
-    # register_startup_jobs()
+    # Register scheduled tasks
+    register_scheduled_tasks()
+    register_startup_tasks()
 
     success = web_server.start()
     sys.exit(0 if success else 1)
diff --git a/cps/admin.py b/cps/admin.py
index bd292ba3..62b3dbe0 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -40,12 +40,13 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services, isoLanguages, fs
-from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
+from . import constants, logger, helper, services, isoLanguages
+from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
+from .services.worker import WorkerThread
 from . import debug_info, _BABEL_TRANSLATIONS
 
 try:
@@ -1568,7 +1569,7 @@ def update_mailsettings():
 @admin_required
 def edit_scheduledtasks():
     content = config.get_scheduled_task_settings()
-    return render_title_template("schedule_edit.html", content=content, title=_(u"Edit Scheduled Tasks Settings"))
+    return render_title_template("schedule_edit.html", config=content, title=_(u"Edit Scheduled Tasks Settings"))
 
 
 @admi.route("/admin/scheduledtasks", methods=["POST"])
@@ -1584,6 +1585,12 @@ def update_scheduledtasks():
     try:
         config.save()
         flash(_(u"Scheduled tasks settings updated"), category="success")
+
+        # Cancel any running tasks
+        schedule.end_scheduled_tasks()
+
+        # Re-register tasks with new settings
+        schedule.register_scheduled_tasks()
     except IntegrityError as ex:
         ub.session.rollback()
         log.error("An unknown error occurred while saving scheduled tasks settings")
@@ -1869,3 +1876,13 @@ def extract_dynamic_field_from_filter(user, filtr):
 def extract_user_identifier(user, filtr):
     dynamic_field = extract_dynamic_field_from_filter(user, filtr)
     return extract_user_data_from_field(user, dynamic_field)
+
+
+@admi.route("/ajax/canceltask", methods=['POST'])
+@login_required
+@admin_required
+def cancel_task():
+    task_id = request.get_json().get('task_id', None)
+    worker = WorkerThread.get_instance()
+    worker.end_task(task_id)
+    return ""
diff --git a/cps/constants.py b/cps/constants.py
index 306d2872..a92a0029 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -24,10 +24,13 @@ from sqlalchemy import __version__ as sql_version
 
 sqlalchemy_version2 = ([int(x) for x in sql_version.split('.')] >= [2,0,0])
 
+# APP_MODE - production, development, or test
+APP_MODE             = os.environ.get('APP_MODE', 'production')
+
 # if installed via pip this variable is set to true (empty file with name .HOMEDIR present)
 HOME_CONFIG = os.path.isfile(os.path.join(os.path.dirname(os.path.abspath(__file__)), '.HOMEDIR'))
 
-#In executables updater is not available, so variable is set to False there
+# In executables updater is not available, so variable is set to False there
 UPDATER_AVAILABLE = True
 
 # Base dir is parent of current file, necessary if called from different folder
@@ -43,7 +46,7 @@ TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
 
 # Cache dir - use CACHE_DIR environment variable, otherwise use the default directory: cps/cache
 DEFAULT_CACHE_DIR   = os.path.join(BASE_DIR, 'cps', 'cache')
-CACHE_DIR           = os.environ.get("CACHE_DIR", DEFAULT_CACHE_DIR)
+CACHE_DIR           = os.environ.get('CACHE_DIR', DEFAULT_CACHE_DIR)
 
 if HOME_CONFIG:
     home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
diff --git a/cps/db.py b/cps/db.py
index 296db7a4..e4cea100 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -443,11 +443,11 @@ class CalibreDB():
         """
         self.session = None
         if self._init:
-            self.initSession(expire_on_commit)
+            self.init_session(expire_on_commit)
 
         self.instances.add(self)
 
-    def initSession(self, expire_on_commit=True):
+    def init_session(self, expire_on_commit=True):
         self.session = self.session_factory()
         self.session.expire_on_commit = expire_on_commit
         self.update_title_sort(self.config)
@@ -593,7 +593,7 @@ class CalibreDB():
                                                           autoflush=True,
                                                           bind=cls.engine))
         for inst in cls.instances:
-            inst.initSession()
+            inst.init_session()
 
         cls._init = True
         return True
diff --git a/cps/helper.py b/cps/helper.py
index 2f2df0e0..a221dbb7 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -57,7 +57,8 @@ from . import logger, config, get_locale, db, fs, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
-from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
+from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
+    STAT_CANCELLED
 from .tasks.mail import TaskEmail
 from .tasks.thumbnail import TaskClearCoverThumbnailCache
 
@@ -838,12 +839,22 @@ def render_task_status(tasklist):
                     ret['status'] = _(u'Started')
                 elif task.stat == STAT_FINISH_SUCCESS:
                     ret['status'] = _(u'Finished')
+                elif task.stat == STAT_ENDED:
+                    ret['status'] = _(u'Ended')
+                elif task.stat == STAT_CANCELLED:
+                    ret['status'] = _(u'Cancelled')
                 else:
                     ret['status'] = _(u'Unknown Status')
 
-            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message)
+            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message) if task.message else _(task.name)
             ret['progress'] = "{} %".format(int(task.progress * 100))
             ret['user'] = escape(user)  # prevent xss
+
+            # Hidden fields
+            ret['id'] = task.id
+            ret['stat'] = task.stat
+            ret['is_cancellable'] = task.is_cancellable
+
             renderedtasklist.append(ret)
 
     return renderedtasklist
@@ -914,5 +925,5 @@ def get_download_link(book_id, book_format, client):
         abort(404)
 
 
-def clear_cover_thumbnail_cache(book_id=None):
+def clear_cover_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
diff --git a/cps/schedule.py b/cps/schedule.py
index 2cddaecb..2bb7878f 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -17,29 +17,70 @@
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import division, print_function, unicode_literals
+import datetime
 
+from . import config, constants
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
+from .services.worker import WorkerThread
 
 
-def register_jobs():
+def get_scheduled_tasks(reconnect=True):
+    tasks = list()
+
+    # Reconnect Calibre database (metadata.db)
+    if reconnect:
+        tasks.append(lambda: TaskReconnectDatabase())
+
+    # Generate all missing book cover thumbnails
+    if config.schedule_generate_book_covers:
+        tasks.append(lambda: TaskGenerateCoverThumbnails())
+
+    # Generate all missing series thumbnails
+    if config.schedule_generate_series_covers:
+        tasks.append(lambda: TaskGenerateSeriesThumbnails())
+
+    return tasks
+
+
+def end_scheduled_tasks():
+    worker = WorkerThread.get_instance()
+    for __, __, __, task in worker.tasks:
+        if task.scheduled and task.is_cancellable:
+            worker.end_task(task.id)
+
+
+def register_scheduled_tasks():
     scheduler = BackgroundScheduler()
 
     if scheduler:
-        # Reconnect Calibre database (metadata.db)
-        scheduler.schedule_task(user=None, task=lambda: TaskReconnectDatabase(), trigger='cron', hour='4,16')
+        # Remove all existing jobs
+        scheduler.remove_all_jobs()
 
-        # Generate all missing book cover thumbnails
-        scheduler.schedule_task(user=None, task=lambda: TaskGenerateCoverThumbnails(), trigger='cron', hour=4)
+        start = config.schedule_start_time
+        end = config.schedule_end_time
 
-        # Generate all missing series thumbnails
-        scheduler.schedule_task(user=None, task=lambda: TaskGenerateSeriesThumbnails(), trigger='cron', hour=4)
+        # Register scheduled tasks
+        if start != end:
+            scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
+            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', hour=end)
+
+        # Kick-off tasks, if they should currently be running
+        now = datetime.datetime.now().hour
+        if start <= now < end:
+            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
 
 
-def register_startup_jobs():
+def register_startup_tasks():
     scheduler = BackgroundScheduler()
 
     if scheduler:
-        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateCoverThumbnails())
-        scheduler.schedule_task_immediately(None, task=lambda: TaskGenerateSeriesThumbnails())
+        start = config.schedule_start_time
+        end = config.schedule_end_time
+        now = datetime.datetime.now().hour
+
+        # Run scheduled tasks immediately for development and testing
+        # Ignore tasks that should currently be running, as these will be added when registering scheduled tasks
+        if constants.APP_MODE in ['development', 'test'] and not (start <= now < end):
+            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index ba578903..971b0bf7 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -48,23 +48,38 @@ class BackgroundScheduler:
 
         return cls._instance
 
-    def _add(self, func, trigger, **trigger_args):
+    def schedule(self, func, trigger, **trigger_args):
         if use_APScheduler:
             return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
 
-    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
-    def schedule_task(self, user, task, trigger, **trigger_args):
+    # Expects a lambda expression for the task
+    def schedule_task(self, task, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
+                worker_task.scheduled = True
                 WorkerThread.add(user, worker_task)
+            return self.schedule(func=scheduled_task, trigger=trigger, **trigger_args)
 
-            return self._add(func=scheduled_task, trigger=trigger, **trigger_args)
-
-    # Expects a lambda expression for the task, so that the task isn't instantiated before the task is scheduled
-    def schedule_task_immediately(self, user, task):
+    # Expects a list of lambda expressions for the tasks
+    def schedule_tasks(self, tasks, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
-            def scheduled_task():
-                WorkerThread.add(user, task())
+            for task in tasks:
+                self.schedule_task(task, user=user, trigger=trigger, **trigger_args)
 
-            return self._add(func=scheduled_task, trigger='date')
+    # Expects a lambda expression for the task
+    def schedule_task_immediately(self, task, user=None):
+        if use_APScheduler:
+            def immediate_task():
+                WorkerThread.add(user, task())
+            return self.schedule(func=immediate_task, trigger='date')
+
+    # Expects a list of lambda expressions for the tasks
+    def schedule_tasks_immediately(self, tasks, user=None):
+        if use_APScheduler:
+            for task in tasks:
+                self.schedule_task_immediately(task, user)
+
+    # Remove all jobs
+    def remove_all_jobs(self):
+        self.scheduler.remove_all_jobs()
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 97068f74..04a4c056 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -21,6 +21,8 @@ STAT_WAITING = 0
 STAT_FAIL = 1
 STAT_STARTED = 2
 STAT_FINISH_SUCCESS = 3
+STAT_ENDED = 4
+STAT_CANCELLED = 5
 
 # Only retain this many tasks in dequeued list
 TASK_CLEANUP_TRIGGER = 20
@@ -50,7 +52,7 @@ class WorkerThread(threading.Thread):
     _instance = None
 
     @classmethod
-    def getInstance(cls):
+    def get_instance(cls):
         if cls._instance is None:
             cls._instance = WorkerThread()
         return cls._instance
@@ -67,12 +69,13 @@ class WorkerThread(threading.Thread):
 
     @classmethod
     def add(cls, user, task):
-        ins = cls.getInstance()
+        ins = cls.get_instance()
         ins.num += 1
-        log.debug("Add Task for user: {}: {}".format(user, task))
+        username = user if user is not None else 'System'
+        log.debug("Add Task for user: {}: {}".format(username, task))
         ins.queue.put(QueuedTask(
             num=ins.num,
-            user=user,
+            user=username,
             added=datetime.now(),
             task=task,
         ))
@@ -134,6 +137,12 @@ class WorkerThread(threading.Thread):
 
             self.queue.task_done()
 
+    def end_task(self, task_id):
+        ins = self.get_instance()
+        for __, __, __, task in ins.tasks:
+            if str(task.id) == str(task_id) and task.is_cancellable:
+                task.stat = STAT_CANCELLED if task.stat == STAT_WAITING else STAT_ENDED
+
 
 class CalibreTask:
     __metaclass__ = abc.ABCMeta
@@ -147,10 +156,11 @@ class CalibreTask:
         self.message = message
         self.id = uuid.uuid4()
         self.self_cleanup = False
+        self._scheduled = False
 
     @abc.abstractmethod
     def run(self, worker_thread):
-        """Provides the caller some human-readable name for this class"""
+        """The main entry-point for this task"""
         raise NotImplementedError
 
     @abc.abstractmethod
@@ -158,6 +168,11 @@ class CalibreTask:
         """Provides the caller some human-readable name for this class"""
         raise NotImplementedError
 
+    @abc.abstractmethod
+    def is_cancellable(self):
+        """Does this task gracefully handle being cancelled (STAT_ENDED, STAT_CANCELLED)?"""
+        raise NotImplementedError
+
     def start(self, *args):
         self.start_time = datetime.now()
         self.stat = STAT_STARTED
@@ -208,7 +223,7 @@ class CalibreTask:
         We have a separate dictating this because there may be certain tasks that want to override this
         """
         # By default, we're good to clean a task if it's "Done"
-        return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL)
+        return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL, STAT_ENDED, STAT_CANCELLED)
 
     '''@progress.setter
     def progress(self, x):        
@@ -226,6 +241,14 @@ class CalibreTask:
     def self_cleanup(self, is_self_cleanup):
         self._self_cleanup = is_self_cleanup
 
+    @property
+    def scheduled(self):
+        return self._scheduled
+
+    @scheduled.setter
+    def scheduled(self, is_scheduled):
+        self._scheduled = is_scheduled
+
     def _handleError(self, error_message):
         self.stat = STAT_FAIL
         self.progress = 1
diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css
index b4fa6045..b2b35423 100644
--- a/cps/static/css/caliBlur.css
+++ b/cps/static/css/caliBlur.css
@@ -5150,7 +5150,7 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head
     pointer-events: none
 }
 
-#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before, #ClearCacheDialog:hover:before, #deleteButton, #deleteModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
+#DeleteDomain:hover:before, #RestartDialog:hover:before, #ShutdownDialog:hover:before, #StatusDialog:hover:before,  #deleteButton, #deleteModal:hover:before, #cancelTaskModal:hover:before, body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover td > a:hover {
     cursor: pointer
 }
 
@@ -5237,6 +5237,10 @@ body.admin > div.container-fluid > div > div.col-sm-10 > div.container-fluid > d
     margin-bottom: 20px
 }
 
+body.admin > div.container-fluid div.scheduled_tasks_details {
+    margin-bottom: 20px
+}
+
 body.admin .btn-default {
     margin-bottom: 10px
 }
@@ -5468,7 +5472,7 @@ body.admin.modal-open .navbar {
     z-index: 0 !important
 }
 
-#RestartDialog, #ShutdownDialog, #StatusDialog, #ClearCacheDialog, #deleteModal {
+#RestartDialog, #ShutdownDialog, #StatusDialog, #deleteModal, #cancelTaskModal {
     top: 0;
     overflow: hidden;
     padding-top: 70px;
@@ -5478,7 +5482,7 @@ body.admin.modal-open .navbar {
     background: rgba(0, 0, 0, .5)
 }
 
-#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #ClearCacheDialog:before, #deleteModal:before {
+#RestartDialog:before, #ShutdownDialog:before, #StatusDialog:before, #deleteModal:before, #cancelTaskModal:before {
     content: "\E208";
     padding-right: 10px;
     display: block;
@@ -5500,18 +5504,18 @@ body.admin.modal-open .navbar {
     z-index: 99
 }
 
-#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
+#RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before, #cancelTaskModal.in:before {
     -webkit-transform: translate(0, 0);
     -ms-transform: translate(0, 0);
     transform: translate(0, 0)
 }
 
-#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
+#RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog, #cancelTaskModal > .modal-dialog {
     width: 450px;
     margin: auto
 }
 
-#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+#RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content, #cancelTaskModal > .modal-dialog > .modal-content {
     max-height: calc(100% - 90px);
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
@@ -5522,7 +5526,7 @@ body.admin.modal-open .navbar {
     width: 450px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header, #StatusDialog > .modal-dialog > .modal-content > .modal-header, #deleteModal > .modal-dialog > .modal-content > .modal-header, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header {
     padding: 15px 20px;
     border-radius: 3px 3px 0 0;
     line-height: 1.71428571;
@@ -5535,7 +5539,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#RestartDialog > .modal-dialog > .modal-content > .modal-header:before, #ShutdownDialog > .modal-dialog > .modal-content > .modal-header:before, #StatusDialog > .modal-dialog > .modal-content > .modal-header:before, #deleteModal > .modal-dialog > .modal-content > .modal-header:before, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header:before {
     padding-right: 10px;
     font-size: 18px;
     color: #999;
@@ -5559,12 +5563,12 @@ body.admin.modal-open .navbar {
     font-family: plex-icons-new, serif
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:before {
-    content: "\EA15";
+#deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+    content: "\EA6D";
     font-family: plex-icons-new, serif
 }
 
-#deleteModal > .modal-dialog > .modal-content > .modal-header:before {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-header:before {
     content: "\EA6D";
     font-family: plex-icons-new, serif
 }
@@ -5587,19 +5591,19 @@ body.admin.modal-open .navbar {
     font-size: 20px
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-header:after {
-    content: "Clear Cover Thumbnail Cache";
-    display: inline-block;
-    font-size: 20px
-}
-
 #deleteModal > .modal-dialog > .modal-content > .modal-header:after {
     content: "Delete Book";
     display: inline-block;
     font-size: 20px
 }
 
-#StatusDialog > .modal-dialog > .modal-content > .modal-header > span, #deleteModal > .modal-dialog > .modal-content > .modal-header > span, #loader > center > img, .rating-mobile {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-header:after {
+    content: "Delete Book";
+    display: inline-block;
+    font-size: 20px
+}
+
+#StatusDialog > .modal-dialog > .modal-content > .modal-header > span, #deleteModal > .modal-dialog > .modal-content > .modal-header > span, #cancelTaskModal > .modal-dialog > .modal-content > .modal-header > span, #loader > center > img, .rating-mobile {
     display: none
 }
 
@@ -5613,7 +5617,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#ShutdownDialog > .modal-dialog > .modal-content > .modal-body, #StatusDialog > .modal-dialog > .modal-content > .modal-body, #deleteModal > .modal-dialog > .modal-content > .modal-body {
+#ShutdownDialog > .modal-dialog > .modal-content > .modal-body, #StatusDialog > .modal-dialog > .modal-content > .modal-body, #deleteModal > .modal-dialog > .modal-content > .modal-body, #cancelTaskModal > .modal-dialog > .modal-content > .modal-body {
     padding: 20px 20px 40px;
     font-size: 16px;
     line-height: 1.6em;
@@ -5623,17 +5627,7 @@ body.admin.modal-open .navbar {
     text-align: left
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body {
-    padding: 20px 20px 10px;
-    font-size: 16px;
-    line-height: 1.6em;
-    font-family: Open Sans Regular, Helvetica Neue, Helvetica, Arial, sans-serif;
-    color: #eee;
-    background: #282828;
-    text-align: left
-}
-
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > p, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > p, #StatusDialog > .modal-dialog > .modal-content > .modal-body > p, #deleteModal > .modal-dialog > .modal-content > .modal-body > p, #cancelTaskModal > .modal-dialog > .modal-content > .modal-body > p {
     padding: 20px 20px 0 0;
     font-size: 16px;
     line-height: 1.6em;
@@ -5642,7 +5636,7 @@ body.admin.modal-open .navbar {
     background: #282828
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart), #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown), #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default, #cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     float: right;
     z-index: 9;
     position: relative;
@@ -5678,11 +5672,11 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > #clear_cache {
+#deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
     position: relative;
-    margin: 25px 0 0 10px;
+    margin: 0 0 0 10px;
     min-width: 80px;
     padding: 10px 18px;
     font-size: 16px;
@@ -5690,7 +5684,7 @@ body.admin.modal-open .navbar {
     border-radius: 3px
 }
 
-#deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-danger {
     float: right;
     z-index: 9;
     position: relative;
@@ -5710,15 +5704,15 @@ body.admin.modal-open .navbar {
     margin: 55px 0 0 10px
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache) {
-    margin: 25px 0 0 10px
-}
-
 #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
     margin: 0 0 0 10px
 }
 
-#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #ClearCacheDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#clear_cache):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
+#cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default {
+    margin: 0 0 0 10px
+}
+
+#RestartDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#restart):hover, #ShutdownDialog > .modal-dialog > .modal-content > .modal-body > .btn-default:not(#shutdown):hover, #deleteModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover, #cancelTaskModal > .modal-dialog > .modal-content > .modal-footer > .btn-default:hover {
     background-color: hsla(0, 0%, 100%, .3)
 }
 
@@ -5752,21 +5746,6 @@ body.admin.modal-open .navbar {
     box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
 }
 
-#ClearCacheDialog > .modal-dialog > .modal-content > .modal-body:after {
-    content: '';
-    position: absolute;
-    width: 100%;
-    height: 72px;
-    background-color: #323232;
-    border-radius: 0 0 3px 3px;
-    left: 0;
-    margin-top: 10px;
-    z-index: 0;
-    border-top: 1px solid #222;
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-    box-shadow: 0 5px 15px rgba(0, 0, 0, .5)
-}
-
 #deleteButton {
     position: fixed;
     top: 60px;
@@ -7355,11 +7334,11 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         background-color: transparent !important
     }
 
-    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #ClearCacheDialog > .modal-dialog, #deleteModal > .modal-dialog {
+    #RestartDialog > .modal-dialog, #ShutdownDialog > .modal-dialog, #StatusDialog > .modal-dialog, #deleteModal > .modal-dialog, #cancelTaskModal > .modal-dialog {
         max-width: calc(100vw - 40px)
     }
 
-    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #ClearCacheDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content {
+    #RestartDialog > .modal-dialog > .modal-content, #ShutdownDialog > .modal-dialog > .modal-content, #StatusDialog > .modal-dialog > .modal-content, #deleteModal > .modal-dialog > .modal-content, #cancelTaskModal > .modal-dialog > .modal-content {
         max-width: calc(100vw - 40px);
         left: 0
     }
@@ -7509,7 +7488,7 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div.
         padding: 30px 15px
     }
 
-    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #ClearCacheDialog.in:before, #deleteModal.in:before {
+    #RestartDialog.in:before, #ShutdownDialog.in:before, #StatusDialog.in:before, #deleteModal.in:before, #cancelTaskModal.in:before {
         left: auto;
         right: 34px
     }
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 5537d189..988e3b9f 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -454,18 +454,6 @@ $(function() {
             }
         });
     });
-    $("#clear_cache").click(function () {
-        $("#spinner3").show();
-        $.ajax({
-            dataType: "json",
-            url: window.location.pathname + "/../../clear-cache",
-            data: {"cache_type":"thumbnails"},
-            success: function(data) {
-                $("#spinner3").hide();
-                $("#ClearCacheDialog").modal("hide");
-            }
-        });
-    });
 
     // Init all data control handlers to default
     $("input[data-control]").trigger("change");
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index a55ec5d1..dc4ab4ab 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -15,7 +15,7 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* exported TableActions, RestrictionActions, EbookActions, responseHandler */
+/* exported TableActions, RestrictionActions, EbookActions, TaskActions, responseHandler */
 /* global getPath, confirmDialog */
 
 var selections = [];
@@ -42,6 +42,24 @@ $(function() {
         }, 1000);
     }
 
+    $("#cancel_task_confirm").click(function() {
+        //get data-id attribute of the clicked element
+        var taskId = $(this).data("task-id");
+        $.ajax({
+            method: "post",
+            contentType: "application/json; charset=utf-8",
+            dataType: "json",
+            url: window.location.pathname + "/../ajax/canceltask",
+            data: JSON.stringify({"task_id": taskId}),
+        });
+    });
+    //triggered when modal is about to be shown
+    $("#cancelTaskModal").on("show.bs.modal", function(e) {
+        //get data-id attribute of the clicked element and store in button
+        var taskId = $(e.relatedTarget).data("task-id");
+        $(e.currentTarget).find("#cancel_task_confirm").data("task-id", taskId);
+    });
+
     $("#books-table").on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table",
         function (e, rowsAfter, rowsBefore) {
             var rows = rowsAfter;
@@ -576,6 +594,7 @@ function handle_header_buttons () {
         $(".header_select").removeAttr("disabled");
     }
 }
+
 /* Function for deleting domain restrictions */
 function TableActions (value, row) {
     return [
@@ -613,6 +632,19 @@ function UserActions (value, row) {
     ].join("");
 }
 
+/* Function for cancelling tasks */
+function TaskActions (value, row) {
+    var cancellableStats = [0, 1, 2];
+    if (row.id && row.is_cancellable && cancellableStats.includes(row.stat)) {
+        return [
+            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.id + "\" title=\"Cancel\">",
+            "<i class=\"glyphicon glyphicon-ban-circle\"></i>",
+            "</div>"
+        ].join("");
+    }
+    return '';
+}
+
 /* Function for keeping checked rows */
 function responseHandler(res) {
     $.each(res.rows, function (i, row) {
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 56cc7076..f150a397 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -234,3 +234,7 @@ class TaskConvert(CalibreTask):
     @property
     def name(self):
         return "Convert"
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 11f0186d..0441d564 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -47,3 +47,7 @@ class TaskReconnectDatabase(CalibreTask):
     @property
     def name(self):
         return "Reconnect Database"
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 292114d5..24064bd3 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -162,7 +162,6 @@ class TaskEmail(CalibreTask):
             log.debug_or_exception(ex)
             self._handleError(u'Error sending e-mail: {}'.format(ex))
 
-
     def send_standard_email(self, msg):
         use_ssl = int(self.settings.get('mail_use_ssl', 0))
         timeout = 600  # set timeout to 5mins
@@ -218,7 +217,6 @@ class TaskEmail(CalibreTask):
             self.asyncSMTP = None
             self._progress = x
 
-
     @classmethod
     def _get_attachment(cls, bookpath, filename):
         """Get file as MIMEBase message"""
@@ -260,5 +258,9 @@ class TaskEmail(CalibreTask):
     def name(self):
         return "E-mail"
 
+    @property
+    def is_cancellable(self):
+        return False
+
     def __str__(self):
         return "{}, {}".format(self.name, self.subject)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index a220fd8c..d147f10d 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#     Copyright (C) 2020 mmonkey
+#     Copyright (C) 2020 monkey
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@ import os
 
 from .. import constants
 from cps import config, db, fs, gdriveutils, logger, ub
-from cps.services.worker import CalibreTask
-from datetime import datetime, timedelta
+from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
+from datetime import datetime
 from sqlalchemy import func, text, or_
 
 try:
@@ -67,7 +67,7 @@ def get_best_fit(width, height, image_width, image_height):
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
-    def __init__(self, task_message=u'Generating cover thumbnails'):
+    def __init__(self, task_message=''):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -79,13 +79,14 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         ]
 
     def run(self, worker_thread):
-        if self.calibre_db.session and use_IM:
+        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+            self.message = 'Scanning Books'
             books_with_covers = self.get_books_with_covers()
             count = len(books_with_covers)
 
-            updated = 0
-            generated = 0
+            total_generated = 0
             for i, book in enumerate(books_with_covers):
+                generated = 0
                 book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
 
                 # Generate new thumbnails for missing covers
@@ -98,16 +99,32 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                 # Replace outdated or missing thumbnails
                 for thumbnail in book_cover_thumbnails:
                     if book.last_modified > thumbnail.generated_at:
-                        updated += 1
+                        generated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
                     elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
-                        updated += 1
+                        generated += 1
                         self.update_book_cover_thumbnail(book, thumbnail)
 
-                self.message = u'Processing book {0} of {1}'.format(i + 1, count)
+                # Increment the progress
                 self.progress = (1.0 / count) * i
 
+                if generated > 0:
+                    total_generated += generated
+                    self.message = u'Generated {0} cover thumbnails'.format(total_generated)
+
+                # Check if job has been cancelled or ended
+                if self.stat == STAT_CANCELLED:
+                    self.log.info(f'GenerateCoverThumbnails task has been cancelled.')
+                    return
+
+                if self.stat == STAT_ENDED:
+                    self.log.info(f'GenerateCoverThumbnails task has been ended.')
+                    return
+
+            if total_generated == 0:
+                self.self_cleanup = True
+
         self._handleSuccess()
         self.app_db_session.remove()
 
@@ -180,7 +197,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                     self.log.info(u'Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
-                    stream.close()
+                    if stream is not None:
+                        stream.close()
             else:
                 book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
                 if not os.path.isfile(book_cover_filepath):
@@ -197,11 +215,15 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return "ThumbnailsGenerate"
+        return 'GenerateCoverThumbnails'
+
+    @property
+    def is_cancellable(self):
+        return True
 
 
 class TaskGenerateSeriesThumbnails(CalibreTask):
-    def __init__(self, task_message=u'Generating series thumbnails'):
+    def __init__(self, task_message=''):
         super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
@@ -209,17 +231,18 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
-            constants.COVER_THUMBNAIL_MEDIUM
+            constants.COVER_THUMBNAIL_MEDIUM,
         ]
 
     def run(self, worker_thread):
-        if self.calibre_db.session and use_IM:
+        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+            self.message = 'Scanning Series'
             all_series = self.get_series_with_four_plus_books()
             count = len(all_series)
 
-            updated = 0
-            generated = 0
+            total_generated = 0
             for i, series in enumerate(all_series):
+                generated = 0
                 series_thumbnails = self.get_series_thumbnails(series.id)
                 series_books = self.get_series_books(series.id)
 
@@ -233,16 +256,32 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                 # Replace outdated or missing thumbnails
                 for thumbnail in series_thumbnails:
                     if any(book.last_modified > thumbnail.generated_at for book in series_books):
-                        updated += 1
+                        generated += 1
                         self.update_series_thumbnail(series_books, thumbnail)
 
                     elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
-                        updated += 1
+                        generated += 1
                         self.update_series_thumbnail(series_books, thumbnail)
 
-                self.message = u'Processing series {0} of {1}'.format(i + 1, count)
+                # Increment the progress
                 self.progress = (1.0 / count) * i
 
+                if generated > 0:
+                    total_generated += generated
+                    self.message = u'Generated {0} series thumbnails'.format(total_generated)
+
+                # Check if job has been cancelled or ended
+                if self.stat == STAT_CANCELLED:
+                    self.log.info(f'GenerateSeriesThumbnails task has been cancelled.')
+                    return
+
+                if self.stat == STAT_ENDED:
+                    self.log.info(f'GenerateSeriesThumbnails task has been ended.')
+                    return
+
+            if total_generated == 0:
+                self.self_cleanup = True
+
         self._handleSuccess()
         self.app_db_session.remove()
 
@@ -302,7 +341,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.app_db_session.rollback()
 
     def generate_series_thumbnail(self, series_books, thumbnail):
-        books = series_books[:4]
+        # Get the last four books in the series based on series_index
+        books = sorted(series_books, key=lambda b: float(b.series_index), reverse=True)[:4]
 
         top = 0
         left = 0
@@ -342,7 +382,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                         self.log.info(u'Error generating thumbnail file: ' + str(ex))
                         raise ex
                     finally:
-                        stream.close()
+                        if stream is not None:
+                            stream.close()
 
                 book_cover_filepath = os.path.join(config.config_calibre_dir, book.path, 'cover.jpg')
                 if not os.path.isfile(book_cover_filepath):
@@ -380,11 +421,15 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return "SeriesThumbnailGenerate"
+        return 'GenerateSeriesThumbnails'
+
+    @property
+    def is_cancellable(self):
+        return True
 
 
 class TaskClearCoverThumbnailCache(CalibreTask):
-    def __init__(self, book_id=None, task_message=u'Clearing cover thumbnail cache'):
+    def __init__(self, book_id, task_message=u'Clearing cover thumbnail cache'):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
@@ -397,8 +442,6 @@ class TaskClearCoverThumbnailCache(CalibreTask):
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
                 for thumbnail in thumbnails:
                     self.delete_thumbnail(thumbnail)
-            else:
-                self.delete_all_thumbnails()
 
         self._handleSuccess()
         self.app_db_session.remove()
@@ -411,19 +454,19 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .all()
 
     def delete_thumbnail(self, thumbnail):
+        thumbnail.expiration = datetime.utcnow()
+
         try:
+            self.app_db_session.commit()
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnail: ' + str(ex))
             self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
-    def delete_all_thumbnails(self):
-        try:
-            self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
-        except Exception as ex:
-            self.log.info(u'Error deleting book thumbnails: ' + str(ex))
-            self._handleError(u'Error deleting book thumbnails: ' + str(ex))
-
     @property
     def name(self):
-        return "ThumbnailsClear"
+        return 'ThumbnailsClear'
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
index d7ef34c2..9f58bf16 100644
--- a/cps/tasks/upload.py
+++ b/cps/tasks/upload.py
@@ -16,3 +16,7 @@ class TaskUpload(CalibreTask):
     @property
     def name(self):
         return "Upload"
+
+    @property
+    def is_cancellable(self):
+        return False
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index ec0fc84e..3fd55ae2 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -159,7 +159,7 @@
   <div class="row">
     <div class="col">
       <h2>{{_('Scheduled Tasks')}}</h2>
-        <div class="col-xs-12 col-sm-12">
+        <div class="col-xs-12 col-sm-12 scheduled_tasks_details">
           <div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Time at which tasks start to run')}}</div>
             <div class="col-xs-6 col-sm-3">{{config.schedule_start_time}}:00</div>
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index f4e72224..71bb2d1a 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -11,7 +11,7 @@
       <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
       <select name="schedule_start_time" id="schedule_start_time" class="form-control">
         {% for n in range(24) %}
-          <option value="{{n}}" {% if content.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+          <option value="{{n}}" {% if config.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
         {% endfor %}
       </select>
     </div>
@@ -19,12 +19,12 @@
       <label for="schedule_end_time">{{_('Time at which tasks stop running')}}</label>
       <select name="schedule_end_time" id="schedule_end_time" class="form-control">
         {% for n in range(24) %}
-          <option value="{{n}}" {% if content.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+          <option value="{{n}}" {% if config.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
         {% endfor %}
       </select>
     </div>
     <div class="form-group">
-      <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" checked>
+      <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" {% if config.schedule_generate_book_covers %}checked{% endif %}>
       <label for="schedule_generate_book_covers">{{_('Generate Book Cover Thumbnails')}}</label>
     </div>
     <div class="form-group">
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index c13ddff9..b36a6daa 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -16,6 +16,9 @@
             <th data-halign="right" data-align="right" data-field="progress" data-sortable="true" data-sorter="elementSorter">{{_('Progress')}}</th>
             <th data-halign="right" data-align="right" data-field="runtime" data-sortable="true" data-sort-name="rt">{{_('Run Time')}}</th>
             <th data-halign="right" data-align="right" data-field="starttime" data-sortable="true" data-sort-name="id">{{_('Start Time')}}</th>
+            {% if g.user.role_admin() %}
+            <th data-halign="right" data-align="right" data-formatter="TaskActions" data-switchable="false">{{_('Actions')}}</th>
+            {% endif %}
             <th data-field="id" data-visible="false"></th>
             <th data-field="rt" data-visible="false"></th>
         </tr>
@@ -23,6 +26,30 @@
     </table>
 </div>
 {% endblock %}
+{% block modal %}
+{{ delete_book() }}
+{% if g.user.role_admin() %}
+<div class="modal fade" id="cancelTaskModal" role="dialog" aria-labelledby="metaCancelTaskLabel">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-danger text-center">
+          <span>{{_('Are you really sure?')}}</span>
+      </div>
+        <div class="modal-body text-center">
+          <p>
+            <span>{{_('This task will be cancelled. Any progress made by this task will be saved.')}}</span>
+            <span>{{_('If this is a scheduled task, it will be re-ran during the next scheduled time.')}}</span>
+          </p>
+        </div>
+      <div class="modal-footer">
+        <input type="button" class="btn btn-danger" value="{{_('Ok')}}" name="cancel_task_confirm" id="cancel_task_confirm" data-dismiss="modal">
+        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endif %}
+{% endblock %}
 {% block js %}
 <script src="{{ url_for('static', filename='js/libs/bootstrap-table/bootstrap-table.min.js') }}"></script>
 <script src="{{ url_for('static', filename='js/table.js') }}"></script>
diff --git a/cps/web.py b/cps/web.py
index 88a5c0ab..c5ad2265 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -124,7 +124,7 @@ def viewer_required(f):
 @web.route("/ajax/emailstat")
 @login_required
 def get_email_status_json():
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     return jsonify(render_task_status(tasks))
 
 
@@ -1055,7 +1055,7 @@ def category_list():
 @login_required
 def get_tasks_status():
     # if current user admin, show all email, otherwise only own emails
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     answer = render_task_status(tasks)
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 

From 9e7f69e38a2958d63d1c0a1299687d82ff686417 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 29 Sep 2021 03:01:28 -0500
Subject: [PATCH 020/220] Updated series cache timeout to one day

---
 cps/templates/image.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/image.html b/cps/templates/image.html
index ae57727b..728384a1 100644
--- a/cps/templates/image.html
+++ b/cps/templates/image.html
@@ -16,7 +16,7 @@
     {% set srcset = series|get_series_srcset %}
     <img
         srcset="{{ srcset }}"
-        src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='month'|cache_timestamp) }}"
+        src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='day'|cache_timestamp) }}"
         title="{{ title }}"
         alt="{{ book_title }}"
     />

From cd3791f5f4b85581705117dcaff9f18bbe052336 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 30 Sep 2021 01:43:31 -0500
Subject: [PATCH 021/220] Always use full-sized image for book edit and details
 pages

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

diff --git a/cps/__init__.py b/cps/__init__.py
index 838da5b4..af4a82e8 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -114,9 +114,8 @@ def create_app():
 
     if os.environ.get('FLASK_DEBUG'):
         cache_buster.init_cache_busting(app)
-        cache_buster.init_cache_busting(app)
-
     log.info('Starting Calibre Web...')
+
     Principal(app)
     lm.init_app(app)
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))
diff --git a/cps/admin.py b/cps/admin.py
index 62b3dbe0..4d168aa0 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -40,7 +40,7 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services, isoLanguages
+from . import constants, logger, helper, services
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index b5f5df7a..12d3bd07 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -1,10 +1,10 @@
-{% import 'image.html' as image %}
 {% extends "layout.html" %}
 {% block body %}
 {% if book %}
   <div class="col-sm-3 col-lg-3 col-xs-12">
     <div class="cover">
-        {{ image.book_cover(book) }}
+        <!-- Always use full-sized image for the book edit page -->
+        <img id="detailcover" title="{{book.title}}" src="{{url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified)}}" />
     </div>
 {% if g.user.role_delete_books() %}
     <div class="text-center">
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 7985691a..19cd079e 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -4,7 +4,8 @@
   <div class="row">
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
-          {{ image.book_cover(entry) }}
+        <!-- Always use full-sized image for the detail page -->
+        <img id="detailcover" title="{{book.title}}" src="{{url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified)}}" />
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">

From 920acaca99879055821744470a0e85f6ee51ec03 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Sat, 11 Dec 2021 01:06:04 +0100
Subject: [PATCH 022/220] everything working to refactor

---
 .gitignore                            |   1 +
 cps/metadata_provider/lubimyczytac.py | 373 ++++++++++++++++++++++++++
 cps/static/js/get_meta.js             |  46 +++-
 requirements.txt                      |   2 +
 4 files changed, 415 insertions(+), 7 deletions(-)
 create mode 100644 cps/metadata_provider/lubimyczytac.py

diff --git a/.gitignore b/.gitignore
index 614e9936..989c7811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ __pycache__/
 .python-version
 env/
 venv/
+p38venv/
 eggs/
 dist/
 executable/
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
new file mode 100644
index 00000000..aab50bb6
--- /dev/null
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -0,0 +1,373 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2021 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  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 json
+import re
+from typing import Dict, List
+from urllib.parse import quote
+
+import requests
+from cps.services.Metadata import Metadata
+from lxml.html import fromstring, tostring
+
+
+def get_int_or_float(v):
+    number_as_float = float(v)
+    number_as_int = int(number_as_float)
+    return number_as_int if number_as_float == number_as_int else number_as_float
+
+
+def strip_accents(s):
+    if s is None:
+        return s
+    else:
+        symbols = (
+            "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
+            "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
+        )
+        tr = dict([(ord(a), ord(b)) for (a, b) in zip(*symbols)])
+        return s.translate(tr)  # .lower()
+
+
+def sanitize_comments_html(html):
+    from markdown2 import Markdown
+
+    text = html2text(html)
+    md = Markdown()
+    html = md.convert(text)
+    return html
+
+
+def html2text(html):
+    from html2text import HTML2Text
+    import re
+
+    # replace <u> tags with <span> as <u> becomes emphasis in html2text
+    if isinstance(html, bytes):
+        html = html.decode("utf-8")
+    html = re.sub(
+        r"<\s*(?P<solidus>/?)\s*[uU]\b(?P<rest>[^>]*)>",
+        r"<\g<solidus>span\g<rest>>",
+        html,
+    )
+    h2t = HTML2Text()
+    h2t.body_width = 0
+    h2t.single_line_break = True
+    h2t.emphasis_mark = "*"
+    return h2t.handle(html)
+
+
+class LubimyCzytac(Metadata):
+    __name__ = "LubimyCzytac.pl"
+    __id__ = "lubimyczytac"
+
+    BASE_URL = "https://lubimyczytac.pl"
+
+    BOOK_SEARCH_RESULT_XPATH = (
+        "*//div[@class='listSearch']//div[@class='authorAllBooks__single']"
+    )
+    SINGLE_BOOK_RESULT_XPATH = ".//div[contains(@class,'authorAllBooks__singleText')]"
+    TITLE_PATH = "/div/a[contains(@class,'authorAllBooks__singleTextTitle')]"
+    TITLE_TEXT_PATH = f"{TITLE_PATH}//text()"
+    URL_PATH = f"{TITLE_PATH}/@href"
+    AUTHORS_PATH = "/div/a[contains(@href,'autor')]//text()"
+
+    SIBLINGS = "/following-sibling::dd"
+
+    CONTAINER = "//section[@class='container book']"
+    PUBLISHER = f"{CONTAINER}//dt[contains(text(),'Wydawnictwo:')]{SIBLINGS}/a/text()"
+    LANGUAGES = f"{CONTAINER}//dt[contains(text(),'Język:')]{SIBLINGS}/text()"
+    DESCRIPTION = f"{CONTAINER}//div[@class='collapse-content']"
+    SERIES = f"{CONTAINER}//span/a[contains(@href,'/cykl/')]"
+
+    DETAILS = "//div[@id='book-details']"
+    PUBLISH_DATE = "//dt[contains(@title,'Data pierwszego wydania"
+    FIRST_PUBLISH_DATE = f"{DETAILS}{PUBLISH_DATE} oryginalnego')]{SIBLINGS}[1]/text()"
+    FIRST_PUBLISH_DATE_PL = f"{DETAILS}{PUBLISH_DATE} polskiego')]{SIBLINGS}[1]/text()"
+    TAGS = "//nav[@aria-label='breadcrumb']//a[contains(@href,'/ksiazki/k/')]/text()"
+    RATING = "//meta[@property='books:rating:value']/@content"
+    COVER = "//meta[@property='og:image']/@content"
+
+    SUMMARY = "//script[@type='application/ld+json']//text()"
+
+    def search(self, query, __):
+        if self.active:
+            result = requests.get(self._prepare_query(title=query))
+            root = fromstring(result.text)
+            matches = self._parse_search_results(root=root)
+            if matches:
+                for ind, match in enumerate(matches):
+                    matches[ind] = self._parse_single_book(match=match)
+            return matches
+
+    def _prepare_query(self, title: str) -> str:
+        query = ""
+        characters_to_remove = "\?()\/"
+        pattern = "[" + characters_to_remove + "]"
+        title = re.sub(pattern, "", title)
+        title = title.replace("_", " ")
+        if '"' in title or ",," in title:
+            title = title.split('"')[0].split(",,")[0]
+
+        if "/" in title:
+            title_tokens = [
+                token for token in title.lower().split(" ") if len(token) > 1
+            ]
+        else:
+            title_tokens = list(
+                self.get_title_tokens(title, strip_joiners=False, strip_subtitle=True)
+            )
+        if title_tokens:
+            tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+            query = query + "%20".join(tokens)
+        if not query:
+            return ""
+        return f"{LubimyCzytac.BASE_URL}/szukaj/ksiazki?phrase={query}"
+
+    def _parse_search_results(self, root) -> List[Dict]:
+        matches = []
+        results = root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
+        for result in results:
+            title = result.xpath(
+                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.TITLE_TEXT_PATH}"
+            )
+            book_url = result.xpath(
+                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}" f"{LubimyCzytac.URL_PATH}"
+            )
+            authors = result.xpath(
+                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.AUTHORS_PATH}"
+            )
+
+            if not title or not book_url or not authors:
+                continue
+            title = title[0].strip()
+            book_url = LubimyCzytac.BASE_URL + book_url[0]
+            book_id = book_url.replace(f"{LubimyCzytac.BASE_URL}/ksiazka/", "").split(
+                "/"
+            )[0]
+            matches.append(
+                {"id": book_id, "title": title, "authors": authors, "url": book_url}
+            )
+        return matches
+
+    def _parse_single_book(self, match: Dict) -> Dict:
+        url = match.get("url")
+        result = requests.get(url)
+        root = fromstring(result.text)
+        match["series"], match["series_index"] = self._parse_series(root=root)
+        match["tags"] = self._parse_tags(root=root)
+        match["publisher"] = self._parse_publisher(root=root)
+        match["publishedDate"] = self._parse_from_summary(
+            root=root, attribute_name="datePublished"
+        )
+        match["rating"] = self._parse_rating(root=root)
+        match["description"] = self._parse_description(root=root)
+        match["cover"] = self._parse_cover(root=root)
+        match["source"] = {
+            "id": self.__id__,
+            "description": self.__name__,
+            "link": LubimyCzytac.BASE_URL,
+        }
+        match['languages'] = self._parse_languages(root=root)
+        match["identifiers"] = {
+            "isbn": self._parse_isbn(root=root),
+            "lubimyczytac": match["id"],
+        }
+        return match
+
+    def _parse_cover(self, root):
+        imgcol_node = root.xpath('//meta[@property="og:image"]/@content')
+        if imgcol_node:
+            img_url = imgcol_node[0]
+            return img_url
+
+    def _parse_publisher(self, root):
+        publisher = root.xpath(LubimyCzytac.PUBLISHER)
+        if publisher:
+            return publisher[0]
+        else:
+            return None
+
+    def _parse_languages(self, root):
+        lang = root.xpath(LubimyCzytac.LANGUAGES)
+        languages = list()
+        if lang:
+            lang = lang[0].strip()
+            if "polski" in lang:
+                languages.append("Polish")
+            if "angielski" in lang:
+                languages.append("English")
+        if not languages:
+            return ['Polish']
+        return languages
+
+    def _parse_series(self, root):
+        try:
+            series_node = root.xpath(LubimyCzytac.SERIES)
+            if series_node:
+                series_lst = root.xpath(f"{LubimyCzytac.SERIES}/text()")
+                if series_lst:
+                    series_txt = series_lst
+                else:
+                    series_txt = None
+            else:
+                return (None, None)
+
+            if series_txt:
+                ser_string = [series_txt[0].replace("\n", "").strip()]
+                ser_nazwa = ser_string
+                for ser in ser_string:
+                    if "tom " in ser:
+                        ser_info = ser.split(" (tom ", 1)
+                        ser_nazwa = ser.split(" (tom ")[0]
+                        break
+
+            if ser_info:
+                series_index_unicode = ser_info[1]
+                series_index_string = str(
+                    series_index_unicode.replace(" ", "").replace(")", "")
+                )
+                # Sprawdzamy, czy cykl nie jest kompletem/pakietem tomów, np. 1-3
+                if "-" in series_index_string:
+                    series_index_string_temp = series_index_string.split("-", 1)
+                    series_index_string = series_index_string_temp[0]
+                if series_index_string.replace(".", "").isdigit() is True:
+                    series_index = get_int_or_float(series_index_string)
+                else:
+                    series_index = 0
+            else:
+                series_index = 0
+            series = ser_nazwa
+            return (series, series_index)
+        except:
+            return (None, None)
+
+    def _parse_tags(self, root):
+        tags = None
+        try:
+            tags_from_genre = root.xpath(LubimyCzytac.TAGS)
+            if tags_from_genre:
+                tags = tags_from_genre
+                tags = [w.replace(", itd.", " itd.") for w in tags]
+                return tags
+            else:
+                return None
+        except:
+            return tags
+
+    def _parse_from_summary(self, root, attribute_name: str) -> str:
+        data = json.loads(root.xpath(LubimyCzytac.SUMMARY)[0])
+        value = data.get(attribute_name)
+        return value.strip() if value is not None else value
+
+    def _parse_rating(self, root):
+        rating_node = root.xpath(LubimyCzytac.RATING)
+        if rating_node:
+            rating_value = round(float((rating_node[0]).replace(",", ".")) / 2)
+            return rating_value
+        return None
+
+    def _parse_date(self, root, xpath="first_publish"):
+        options = {
+            "first_publish": LubimyCzytac.FIRST_PUBLISH_DATE,
+            "first_publish_pl": LubimyCzytac.FIRST_PUBLISH_DATE_PL,
+        }
+        path = options.get(xpath)
+        from dateutil import parser
+
+        data = root.xpath(path)
+        if data:
+            first_pub_date = data[0].strip()
+            return parser.parse(first_pub_date)
+        return None
+
+    def _parse_isbn(self, root):
+        isbn_node = root.xpath('//meta[@property="books:isbn"]/@content')[0]
+        return isbn_node
+
+    def _parse_description(self, root):
+        comments = ""
+        description_node = root.xpath(LubimyCzytac.DESCRIPTION)
+        if description_node:
+            for zrodla in root.xpath('//p[@class="source"]'):
+                zrodla.getparent().remove(zrodla)
+            comments = tostring(description_node[0], method="html")
+            comments = sanitize_comments_html(comments)
+
+        else:
+            # try <meta>
+            description_node = root.xpath('//meta[@property="og:description"]/@content')
+            if description_node:
+                comments = description_node[0]
+                comments = sanitize_comments_html(comments)
+
+        pages = self._parse_from_summary(root=root, attribute_name="numberOfPages")
+        if pages:
+            comments += f'<p id="strony">Książka ma {pages} stron(y).</p>'
+
+        first_publish_date = self._parse_date(root=root)
+        if first_publish_date:
+            comments += f'<p id="pierwsze_wydanie">Data pierwszego wydania: {first_publish_date.strftime("%d.%m.%Y")}</p>'
+
+        first_publish_date_pl = self._parse_date(root=root, xpath="first_publish_pl")
+        if first_publish_date_pl:
+            comments += f'<p id="pierwsze_wydanie_pl">Data pierwszego wydania w Polsce: {first_publish_date_pl.strftime("%d.%m.%Y")}</p>'
+
+        return comments
+
+    def get_title_tokens(self, title, strip_joiners=True, strip_subtitle=False):
+        """
+        Taken from https://github.com/kovidgoyal/calibre/blob/master/src/calibre/ebooks/metadata/sources/base.py.
+        """
+        # strip sub-titles
+        if strip_subtitle:
+            subtitle = re.compile(r"([\(\[\{].*?[\)\]\}]|[/:\\].*$)")
+            if len(subtitle.sub("", title)) > 1:
+                title = subtitle.sub("", title)
+
+        title_patterns = [
+            (re.compile(pat, re.IGNORECASE), repl)
+            for pat, repl in [
+                # Remove things like: (2010) (Omnibus) etc.
+                (
+                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|audiobook|audio\scd|paperback|turtleback|mass\s*market|edition|ed\.)[\])}]",
+                    "",
+                ),
+                # Remove any strings that contain the substring edition inside
+                # parentheses
+                (r"(?i)[({\[].*?(edition|ed.).*?[\]})]", ""),
+                # Remove commas used a separators in numbers
+                (r"(\d+),(\d+)", r"\1\2"),
+                # Remove hyphens only if they have whitespace before them
+                (r"(\s-)", " "),
+                # Replace other special chars with a space
+                (r"""[:,;!@$%^&*(){}.`~"\s\[\]/]《》「」“”""", " "),
+            ]
+        ]
+
+        for pat, repl in title_patterns:
+            title = pat.sub(repl, title)
+
+        tokens = title.split()
+        for token in tokens:
+            token = token.strip().strip('"').strip("'")
+            if token and (
+                not strip_joiners or token.lower() not in ("a", "and", "the", "&")
+            ):
+                yield token
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 51ab740d..a8643065 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -26,19 +26,26 @@ $(function () {
        )
     };
 
+    function getUniqueValues(attribute_name, book){
+        var presentArray = $.map($("#"+attribute_name).val().split(","), $.trim);
+        if ( presentArray.length === 1 && presentArray[0] === "") {
+            presentArray = [];
+        }
+        $.each(book[attribute_name], function(i, el) {
+            if ($.inArray(el, presentArray) === -1) presentArray.push(el);
+        });
+        return presentArray
+    }
+
     function populateForm (book) {
         tinymce.get("description").setContent(book.description);
-        var uniqueTags = $.map($("#tags").val().split(","), $.trim);
-        if ( uniqueTags.length == 1 && uniqueTags[0] == "") {
-            uniqueTags = [];
-        }
-        $.each(book.tags, function(i, el) {
-            if ($.inArray(el, uniqueTags) === -1) uniqueTags.push(el);
-        });
+        var uniqueTags = getUniqueValues('tags', book)
+        var uniqueLanguages = getUniqueValues('languages', book)
         var ampSeparatedAuthors = (book.authors || []).join(" & ");
         $("#bookAuthor").val(ampSeparatedAuthors);
         $("#book_title").val(book.title);
         $("#tags").val(uniqueTags.join(", "));
+        $("#languages").val(uniqueLanguages.join(", "));
         $("#rating").data("rating").setValue(Math.round(book.rating));
         if(book.cover !== null){
             $(".cover img").attr("src", book.cover);
@@ -48,7 +55,32 @@ $(function () {
         $("#publisher").val(book.publisher);
         if (typeof book.series !== "undefined") {
             $("#series").val(book.series);
+            $("#series_index").val(book.series_index);
         }
+        if (typeof book.identifiers !== "undefined") {
+            populateIdentifiers(book.identifiers)
+        }
+    }
+
+    function populateIdentifiers(identifiers){
+       for (const property in identifiers) {
+          console.log(`${property}: ${identifiers[property]}`);
+          if ($('input[name="identifier-type-'+property+'"]').length) {
+              $('input[name="identifier-val-'+property+'"]').val(identifiers[property])
+          }
+          else {
+              addIdentifier(property, identifiers[property])
+          }
+        }
+    }
+
+    function addIdentifier(name, value){
+        var line = '<tr>';
+        line += '<td><input type="text" class="form-control" name="identifier-type-'+ name +'" required="required" placeholder="' + _("Identifier Type") +'" value="'+ name +'"></td>';
+        line += '<td><input type="text" class="form-control" name="identifier-val-'+ name +'" required="required" placeholder="' + _("Identifier Value") +'" value="'+ value +'"></td>';
+        line += '<td><a class="btn btn-default" onclick="removeIdentifierLine(this)">'+_("Remove")+'</a></td>';
+        line += '</tr>';
+        $("#identifier-table").append(line);
     }
 
     function doSearch (keyword) {
diff --git a/requirements.txt b/requirements.txt
index 1db961fe..d1f58a8d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,3 +14,5 @@ Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.3.0
 lxml>=3.8.0,<4.7.0
 flask-wtf>=0.14.2,<1.1.0
+markdown2==2.4.2
+html2text==2020.1.16

From d55626d4452bf15849b3ead2266a2ca89f8d9c8d Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 01:23:03 +0100
Subject: [PATCH 023/220] refactor and cleaning

---
 cps/metadata_provider/comicvine.py    |   4 +-
 cps/metadata_provider/google.py       |  12 +-
 cps/metadata_provider/lubimyczytac.py | 468 +++++++++++++-------------
 cps/services/Metadata.py              |  33 +-
 requirements.txt                      |   1 +
 5 files changed, 278 insertions(+), 240 deletions(-)

diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 8f496608..195e68f8 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -26,7 +26,7 @@ class ComicVine(Metadata):
     __name__ = "ComicVine"
     __id__ = "comicvine"
 
-    def search(self, query, __):
+    def search(self, query, generic_cover=""):
         val = list()
         apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6"
         if self.active:
@@ -52,7 +52,7 @@ class ComicVine(Metadata):
                 v['tags'] = ["Comics", seriesTitle]
                 v['rating'] = 0
                 v['series'] = seriesTitle
-                v['cover'] = r['image'].get('original_url')
+                v['cover'] = r['image'].get('original_url', generic_cover)
                 v['source'] = {
                     "id": self.__id__,
                     "description": "ComicVine Books",
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index f3d02d8e..8be8ad74 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -17,19 +17,20 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # Google Books api document: https://developers.google.com/books/docs/v1/using
-
-
 import requests
+
 from cps.services.Metadata import Metadata
 
+
 class Google(Metadata):
     __name__ = "Google"
     __id__ = "google"
+    BASE_URL = "https://www.googleapis.com/books/v1/volumes?q="
 
-    def search(self, query, __):
+    def search(self, query, generic_cover=""):
         if self.active:
             val = list()
-            result = requests.get("https://www.googleapis.com/books/v1/volumes?q="+query.replace(" ","+"))
+            result = requests.get(Google.BASE_URL + query.replace(" ","+"))
             for r in result.json()['items']:
                 v = dict()
                 v['id'] = r['id']
@@ -43,7 +44,8 @@ class Google(Metadata):
                 if r['volumeInfo'].get('imageLinks'):
                     v['cover'] = r['volumeInfo']['imageLinks']['thumbnail'].replace("http://", "https://")
                 else:
-                    v['cover'] = "/../../../static/generic_cover.jpg"
+                    # v['cover'] = "/../../../static/generic_cover.jpg"
+                    v['cover'] = generic_cover
                 v['source'] = {
                     "id": self.__id__,
                     "description": "Google Books",
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index aab50bb6..ee66d1b4 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -15,47 +15,47 @@
 #
 #  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 json
 import re
-from typing import Dict, List
+from typing import Dict, Generator, List, Optional, Tuple, Union
 from urllib.parse import quote
 
 import requests
-from cps.services.Metadata import Metadata
-from lxml.html import fromstring, tostring
+from dateutil import parser
+from html2text import HTML2Text
+from lxml.html import HtmlElement, fromstring, tostring
+from markdown2 import Markdown
+
+from cps.services.Metadata import MetaRecord, Metadata
+
+SYMBOLS_TO_TRANSLATE = (
+    "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
+    "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
+)
+SYMBOL_TRANSLATION_MAP = dict(
+    [(ord(a), ord(b)) for (a, b) in zip(*SYMBOLS_TO_TRANSLATE)]
+)
 
 
-def get_int_or_float(v):
-    number_as_float = float(v)
+def get_int_or_float(value: str) -> Union[int, float]:
+    number_as_float = float(value)
     number_as_int = int(number_as_float)
     return number_as_int if number_as_float == number_as_int else number_as_float
 
 
-def strip_accents(s):
-    if s is None:
-        return s
-    else:
-        symbols = (
-            "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
-            "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
-        )
-        tr = dict([(ord(a), ord(b)) for (a, b) in zip(*symbols)])
-        return s.translate(tr)  # .lower()
+def strip_accents(s: Optional[str]) -> Optional[str]:
+    return s.translate(SYMBOL_TRANSLATION_MAP) if s is not None else s
 
 
-def sanitize_comments_html(html):
-    from markdown2 import Markdown
-
+def sanitize_comments_html(html: str) -> str:
     text = html2text(html)
     md = Markdown()
     html = md.convert(text)
     return html
 
 
-def html2text(html):
-    from html2text import HTML2Text
-    import re
-
+def html2text(html: str) -> str:
     # replace <u> tags with <span> as <u> becomes emphasis in html2text
     if isinstance(html, bytes):
         html = html.decode("utf-8")
@@ -92,26 +92,36 @@ class LubimyCzytac(Metadata):
     PUBLISHER = f"{CONTAINER}//dt[contains(text(),'Wydawnictwo:')]{SIBLINGS}/a/text()"
     LANGUAGES = f"{CONTAINER}//dt[contains(text(),'Język:')]{SIBLINGS}/text()"
     DESCRIPTION = f"{CONTAINER}//div[@class='collapse-content']"
-    SERIES = f"{CONTAINER}//span/a[contains(@href,'/cykl/')]"
+    SERIES = f"{CONTAINER}//span/a[contains(@href,'/cykl/')]/text()"
 
     DETAILS = "//div[@id='book-details']"
     PUBLISH_DATE = "//dt[contains(@title,'Data pierwszego wydania"
     FIRST_PUBLISH_DATE = f"{DETAILS}{PUBLISH_DATE} oryginalnego')]{SIBLINGS}[1]/text()"
     FIRST_PUBLISH_DATE_PL = f"{DETAILS}{PUBLISH_DATE} polskiego')]{SIBLINGS}[1]/text()"
     TAGS = "//nav[@aria-label='breadcrumb']//a[contains(@href,'/ksiazki/k/')]/text()"
+
     RATING = "//meta[@property='books:rating:value']/@content"
     COVER = "//meta[@property='og:image']/@content"
+    ISBN = "//meta[@property='books:isbn']/@content"
+    META_TITLE = "//meta[@property='og:description']/@content"
 
     SUMMARY = "//script[@type='application/ld+json']//text()"
 
-    def search(self, query, __):
+    def search(self, query: str, generic_cover: str = "") -> Optional[List]:
         if self.active:
             result = requests.get(self._prepare_query(title=query))
             root = fromstring(result.text)
-            matches = self._parse_search_results(root=root)
+            lc_parser = LubimyCzytacParser(root=root, metadata=self)
+            matches = lc_parser.parse_search_results()
             if matches:
-                for ind, match in enumerate(matches):
-                    matches[ind] = self._parse_single_book(match=match)
+                final_matches = []
+                for match in matches:
+                    response = requests.get(match.get("url"))
+                    match = lc_parser.parse_single_book(
+                        match=match, response=response, generic_cover=generic_cover
+                    )
+                    final_matches.append(match)
+                return final_matches
             return matches
 
     def _prepare_query(self, title: str) -> str:
@@ -128,9 +138,7 @@ class LubimyCzytac(Metadata):
                 token for token in title.lower().split(" ") if len(token) > 1
             ]
         else:
-            title_tokens = list(
-                self.get_title_tokens(title, strip_joiners=False, strip_subtitle=True)
-            )
+            title_tokens = list(self.get_title_tokens(title, strip_joiners=False))
         if title_tokens:
             tokens = [quote(t.encode("utf-8")) for t in title_tokens]
             query = query + "%20".join(tokens)
@@ -138,215 +146,21 @@ class LubimyCzytac(Metadata):
             return ""
         return f"{LubimyCzytac.BASE_URL}/szukaj/ksiazki?phrase={query}"
 
-    def _parse_search_results(self, root) -> List[Dict]:
-        matches = []
-        results = root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
-        for result in results:
-            title = result.xpath(
-                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.TITLE_TEXT_PATH}"
-            )
-            book_url = result.xpath(
-                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}" f"{LubimyCzytac.URL_PATH}"
-            )
-            authors = result.xpath(
-                f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.AUTHORS_PATH}"
-            )
-
-            if not title or not book_url or not authors:
-                continue
-            title = title[0].strip()
-            book_url = LubimyCzytac.BASE_URL + book_url[0]
-            book_id = book_url.replace(f"{LubimyCzytac.BASE_URL}/ksiazka/", "").split(
-                "/"
-            )[0]
-            matches.append(
-                {"id": book_id, "title": title, "authors": authors, "url": book_url}
-            )
-        return matches
-
-    def _parse_single_book(self, match: Dict) -> Dict:
-        url = match.get("url")
-        result = requests.get(url)
-        root = fromstring(result.text)
-        match["series"], match["series_index"] = self._parse_series(root=root)
-        match["tags"] = self._parse_tags(root=root)
-        match["publisher"] = self._parse_publisher(root=root)
-        match["publishedDate"] = self._parse_from_summary(
-            root=root, attribute_name="datePublished"
-        )
-        match["rating"] = self._parse_rating(root=root)
-        match["description"] = self._parse_description(root=root)
-        match["cover"] = self._parse_cover(root=root)
-        match["source"] = {
-            "id": self.__id__,
-            "description": self.__name__,
-            "link": LubimyCzytac.BASE_URL,
-        }
-        match['languages'] = self._parse_languages(root=root)
-        match["identifiers"] = {
-            "isbn": self._parse_isbn(root=root),
-            "lubimyczytac": match["id"],
-        }
-        return match
-
-    def _parse_cover(self, root):
-        imgcol_node = root.xpath('//meta[@property="og:image"]/@content')
-        if imgcol_node:
-            img_url = imgcol_node[0]
-            return img_url
-
-    def _parse_publisher(self, root):
-        publisher = root.xpath(LubimyCzytac.PUBLISHER)
-        if publisher:
-            return publisher[0]
-        else:
-            return None
-
-    def _parse_languages(self, root):
-        lang = root.xpath(LubimyCzytac.LANGUAGES)
-        languages = list()
-        if lang:
-            lang = lang[0].strip()
-            if "polski" in lang:
-                languages.append("Polish")
-            if "angielski" in lang:
-                languages.append("English")
-        if not languages:
-            return ['Polish']
-        return languages
-
-    def _parse_series(self, root):
-        try:
-            series_node = root.xpath(LubimyCzytac.SERIES)
-            if series_node:
-                series_lst = root.xpath(f"{LubimyCzytac.SERIES}/text()")
-                if series_lst:
-                    series_txt = series_lst
-                else:
-                    series_txt = None
-            else:
-                return (None, None)
-
-            if series_txt:
-                ser_string = [series_txt[0].replace("\n", "").strip()]
-                ser_nazwa = ser_string
-                for ser in ser_string:
-                    if "tom " in ser:
-                        ser_info = ser.split(" (tom ", 1)
-                        ser_nazwa = ser.split(" (tom ")[0]
-                        break
-
-            if ser_info:
-                series_index_unicode = ser_info[1]
-                series_index_string = str(
-                    series_index_unicode.replace(" ", "").replace(")", "")
-                )
-                # Sprawdzamy, czy cykl nie jest kompletem/pakietem tomów, np. 1-3
-                if "-" in series_index_string:
-                    series_index_string_temp = series_index_string.split("-", 1)
-                    series_index_string = series_index_string_temp[0]
-                if series_index_string.replace(".", "").isdigit() is True:
-                    series_index = get_int_or_float(series_index_string)
-                else:
-                    series_index = 0
-            else:
-                series_index = 0
-            series = ser_nazwa
-            return (series, series_index)
-        except:
-            return (None, None)
-
-    def _parse_tags(self, root):
-        tags = None
-        try:
-            tags_from_genre = root.xpath(LubimyCzytac.TAGS)
-            if tags_from_genre:
-                tags = tags_from_genre
-                tags = [w.replace(", itd.", " itd.") for w in tags]
-                return tags
-            else:
-                return None
-        except:
-            return tags
-
-    def _parse_from_summary(self, root, attribute_name: str) -> str:
-        data = json.loads(root.xpath(LubimyCzytac.SUMMARY)[0])
-        value = data.get(attribute_name)
-        return value.strip() if value is not None else value
-
-    def _parse_rating(self, root):
-        rating_node = root.xpath(LubimyCzytac.RATING)
-        if rating_node:
-            rating_value = round(float((rating_node[0]).replace(",", ".")) / 2)
-            return rating_value
-        return None
-
-    def _parse_date(self, root, xpath="first_publish"):
-        options = {
-            "first_publish": LubimyCzytac.FIRST_PUBLISH_DATE,
-            "first_publish_pl": LubimyCzytac.FIRST_PUBLISH_DATE_PL,
-        }
-        path = options.get(xpath)
-        from dateutil import parser
-
-        data = root.xpath(path)
-        if data:
-            first_pub_date = data[0].strip()
-            return parser.parse(first_pub_date)
-        return None
-
-    def _parse_isbn(self, root):
-        isbn_node = root.xpath('//meta[@property="books:isbn"]/@content')[0]
-        return isbn_node
-
-    def _parse_description(self, root):
-        comments = ""
-        description_node = root.xpath(LubimyCzytac.DESCRIPTION)
-        if description_node:
-            for zrodla in root.xpath('//p[@class="source"]'):
-                zrodla.getparent().remove(zrodla)
-            comments = tostring(description_node[0], method="html")
-            comments = sanitize_comments_html(comments)
-
-        else:
-            # try <meta>
-            description_node = root.xpath('//meta[@property="og:description"]/@content')
-            if description_node:
-                comments = description_node[0]
-                comments = sanitize_comments_html(comments)
-
-        pages = self._parse_from_summary(root=root, attribute_name="numberOfPages")
-        if pages:
-            comments += f'<p id="strony">Książka ma {pages} stron(y).</p>'
-
-        first_publish_date = self._parse_date(root=root)
-        if first_publish_date:
-            comments += f'<p id="pierwsze_wydanie">Data pierwszego wydania: {first_publish_date.strftime("%d.%m.%Y")}</p>'
-
-        first_publish_date_pl = self._parse_date(root=root, xpath="first_publish_pl")
-        if first_publish_date_pl:
-            comments += f'<p id="pierwsze_wydanie_pl">Data pierwszego wydania w Polsce: {first_publish_date_pl.strftime("%d.%m.%Y")}</p>'
-
-        return comments
-
-    def get_title_tokens(self, title, strip_joiners=True, strip_subtitle=False):
+    @staticmethod
+    def get_title_tokens(
+        title: str, strip_joiners: bool = True
+    ) -> Generator[str, None, None]:
         """
-        Taken from https://github.com/kovidgoyal/calibre/blob/master/src/calibre/ebooks/metadata/sources/base.py.
+        Taken from calibre source code
         """
-        # strip sub-titles
-        if strip_subtitle:
-            subtitle = re.compile(r"([\(\[\{].*?[\)\]\}]|[/:\\].*$)")
-            if len(subtitle.sub("", title)) > 1:
-                title = subtitle.sub("", title)
-
         title_patterns = [
             (re.compile(pat, re.IGNORECASE), repl)
             for pat, repl in [
                 # Remove things like: (2010) (Omnibus) etc.
                 (
-                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|audiobook|audio\scd|paperback|turtleback|mass\s*market|edition|ed\.)[\])}]",
+                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|"
+                    r"audiobook|audio\scd|paperback|turtleback|"
+                    r"mass\s*market|edition|ed\.)[\])}]",
                     "",
                 ),
                 # Remove any strings that contain the substring edition inside
@@ -371,3 +185,193 @@ class LubimyCzytac(Metadata):
                 not strip_joiners or token.lower() not in ("a", "and", "the", "&")
             ):
                 yield token
+
+
+class LubimyCzytacParser:
+    PAGES_TEMPLATE = "<p id='strony'>Książka ma {0} stron(y).</p>"
+    PUBLISH_DATE_TEMPLATE = "<p id='pierwsze_wydanie'>Data pierwszego wydania: {0}</p>"
+    PUBLISH_DATE_PL_TEMPLATE = (
+        "<p id='pierwsze_wydanie'>Data pierwszego wydania w Polsce: {0}</p>"
+    )
+
+    def __init__(self, root: HtmlElement, metadata: Metadata) -> None:
+        self.root = root
+        self.metadata = metadata
+
+    def parse_search_results(self) -> List[Dict]:
+        matches = []
+        results = self.root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
+        for result in results:
+            title = self._parse_xpath_node(
+                root=result,
+                xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.TITLE_TEXT_PATH}",
+            )
+
+            book_url = self._parse_xpath_node(
+                root=result,
+                xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.URL_PATH}",
+            )
+            authors = self._parse_xpath_node(
+                root=result,
+                xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
+                f"{LubimyCzytac.AUTHORS_PATH}",
+                take_first=False,
+            )
+            if not all([title, book_url, authors]):
+                continue
+            matches.append(
+                {
+                    "id": book_url.replace(f"/ksiazka/", "").split("/")[0],
+                    "title": title,
+                    "authors": [strip_accents(author) for author in authors],
+                    "url": LubimyCzytac.BASE_URL + book_url,
+                }
+            )
+        return matches
+
+    def parse_single_book(
+        self, match: Dict, response, generic_cover: str
+    ) -> MetaRecord:
+        self.root = fromstring(response.text)
+        match["series"], match["series_index"] = self._parse_series()
+        match["tags"] = self._parse_tags()
+        match["publisher"] = self._parse_publisher()
+        match["publishedDate"] = self._parse_from_summary(
+            attribute_name="datePublished"
+        )
+        match["rating"] = self._parse_rating()
+        match["description"] = self._parse_description()
+        match["cover"] = self._parse_cover(generic_cover=generic_cover)
+        match["source"] = {
+            "id": self.metadata.__id__,
+            "description": self.metadata.__name__,
+            "link": LubimyCzytac.BASE_URL,
+        }
+        match["languages"] = self._parse_languages()
+        match["identifiers"] = {
+            "isbn": self._parse_isbn(),
+            "lubimyczytac": match["id"],
+        }
+        return match
+
+    def _parse_xpath_node(
+        self,
+        xpath: str,
+        root: HtmlElement = None,
+        take_first: bool = True,
+        strip_element: bool = True,
+    ) -> Optional[Union[str, List[str]]]:
+        root = root if root is not None else self.root
+        node = root.xpath(xpath)
+        if not node:
+            return None
+        return (
+            (node[0].strip() if strip_element else node[0])
+            if take_first
+            else [x.strip() for x in node]
+        )
+
+    def _parse_cover(self, generic_cover) -> Optional[str]:
+        return (
+            self._parse_xpath_node(xpath=LubimyCzytac.COVER, take_first=True)
+            or generic_cover
+        )
+
+    def _parse_publisher(self) -> Optional[str]:
+        return self._parse_xpath_node(xpath=LubimyCzytac.PUBLISHER, take_first=True)
+
+    def _parse_languages(self) -> List[str]:
+        languages = list()
+        lang = self._parse_xpath_node(xpath=LubimyCzytac.LANGUAGES, take_first=True)
+        if lang:
+            if "polski" in lang:
+                languages.append("Polish")
+            if "angielski" in lang:
+                languages.append("English")
+        return languages
+
+    def _parse_series(self) -> Tuple[Optional[str], Optional[Union[float, int]]]:
+        series_index = 0
+        series = self._parse_xpath_node(xpath=LubimyCzytac.SERIES, take_first=True)
+        if series:
+            if "tom " in series:
+                series_name, series_info = series.split(" (tom ", 1)
+                series_info = series_info.replace(" ", "").replace(")", "")
+                # Check if book is not a bundle, i.e. chapter 1-3
+                if "-" in series_info:
+                    series_info = series_info.split("-", 1)[0]
+                if series_info.replace(".", "").isdigit() is True:
+                    series_index = get_int_or_float(series_info)
+                return series_name, series_index
+        return None, None
+
+    def _parse_tags(self) -> List[str]:
+        tags = self._parse_xpath_node(xpath=LubimyCzytac.TAGS, take_first=False)
+        return [
+            strip_accents(w.replace(", itd.", " itd."))
+            for w in tags
+            if isinstance(w, str)
+        ]
+
+    def _parse_from_summary(self, attribute_name: str) -> Optional[str]:
+        value = None
+        summary_text = self._parse_xpath_node(xpath=LubimyCzytac.SUMMARY)
+        if summary_text:
+            data = json.loads(summary_text)
+            value = data.get(attribute_name)
+        return value.strip() if value is not None else value
+
+    def _parse_rating(self) -> Optional[str]:
+        rating = self._parse_xpath_node(xpath=LubimyCzytac.RATING)
+        return round(float(rating.replace(",", ".")) / 2) if rating else rating
+
+    def _parse_date(self, xpath="first_publish") -> Optional[datetime.datetime]:
+        options = {
+            "first_publish": LubimyCzytac.FIRST_PUBLISH_DATE,
+            "first_publish_pl": LubimyCzytac.FIRST_PUBLISH_DATE_PL,
+        }
+        date = self._parse_xpath_node(xpath=options.get(xpath))
+        return parser.parse(date) if date else None
+
+    def _parse_isbn(self) -> Optional[str]:
+        return self._parse_xpath_node(xpath=LubimyCzytac.ISBN)
+
+    def _parse_description(self) -> str:
+        description = ""
+        description_node = self._parse_xpath_node(
+            xpath=LubimyCzytac.DESCRIPTION, strip_element=False
+        )
+        if description_node is not None:
+            for source in self.root.xpath('//p[@class="source"]'):
+                source.getparent().remove(source)
+            description = tostring(description_node, method="html")
+            description = sanitize_comments_html(description)
+
+        else:
+            description_node = self._parse_xpath_node(xpath=LubimyCzytac.META_TITLE)
+            if description_node is not None:
+                description = description_node
+                description = sanitize_comments_html(description)
+        description = self._add_extra_info_to_description(description=description)
+        return description
+
+    def _add_extra_info_to_description(self, description: str) -> str:
+        pages = self._parse_from_summary(attribute_name="numberOfPages")
+        if pages:
+            description += LubimyCzytacParser.PAGES_TEMPLATE.format(pages)
+
+        first_publish_date = self._parse_date()
+        if first_publish_date:
+            description += LubimyCzytacParser.PUBLISH_DATE_TEMPLATE.format(
+                first_publish_date.strftime("%d.%m.%Y")
+            )
+
+        first_publish_date_pl = self._parse_date(xpath="first_publish_pl")
+        if first_publish_date_pl:
+            description += LubimyCzytacParser.PUBLISH_DATE_PL_TEMPLATE.format(
+                first_publish_date_pl.strftime("%d.%m.%Y")
+            )
+
+        return description
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index d6e4e7d5..17a9e38e 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -15,13 +15,44 @@
 #
 #  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 abc
+from typing import Dict, List, Optional, TypedDict, Union
 
 
-class Metadata():
+class Metadata:
     __name__ = "Generic"
+    __id__ = "generic"
 
     def __init__(self):
         self.active = True
 
     def set_status(self, state):
         self.active = state
+
+    @abc.abstractmethod
+    def search(self, query: str, generic_cover: str):
+        pass
+
+
+class MetaSourceInfo(TypedDict):
+    id: str
+    description: str
+    link: str
+
+
+class MetaRecord(TypedDict):
+    id: Union[str, int]
+    title: str
+    authors: List[str]
+    url: str
+    cover: str
+    series: Optional[str]
+    series_index: Optional[Union[int, float]]
+    tags: Optional[List[str]]
+    publisher: Optional[str]
+    publishedDate: Optional[str]
+    rating: Optional[int]
+    description: Optional[str]
+    source: MetaSourceInfo
+    languages: Optional[List[str]]
+    identifiers: Dict[str, Union[str, int]]
diff --git a/requirements.txt b/requirements.txt
index d1f58a8d..d09c2157 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,3 +16,4 @@ lxml>=3.8.0,<4.7.0
 flask-wtf>=0.14.2,<1.1.0
 markdown2==2.4.2
 html2text==2020.1.16
+python-dateutil==2.8.2

From 362fdc57166e778dd8f08f326adbaaa6b0bf3d5d Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 02:14:53 +0100
Subject: [PATCH 024/220] run lubimyczytac detail pages in threadpool

---
 cps/metadata_provider/lubimyczytac.py | 60 ++++----------------
 cps/search_metadata.py                | 81 +++++++++++++++------------
 cps/services/Metadata.py              | 45 ++++++++++++++-
 3 files changed, 99 insertions(+), 87 deletions(-)

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index ee66d1b4..1d4e18e1 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 #  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
 #    Copyright (C) 2021 OzzieIsaacs
 #
@@ -18,7 +17,8 @@
 import datetime
 import json
 import re
-from typing import Dict, Generator, List, Optional, Tuple, Union
+from multiprocessing.pool import ThreadPool
+from typing import Dict, List, Optional, Tuple, Union
 from urllib.parse import quote
 
 import requests
@@ -114,13 +114,14 @@ class LubimyCzytac(Metadata):
             lc_parser = LubimyCzytacParser(root=root, metadata=self)
             matches = lc_parser.parse_search_results()
             if matches:
-                final_matches = []
-                for match in matches:
-                    response = requests.get(match.get("url"))
-                    match = lc_parser.parse_single_book(
-                        match=match, response=response, generic_cover=generic_cover
+                with ThreadPool(processes=10) as pool:
+                    final_matches = pool.starmap(
+                        lc_parser.parse_single_book,
+                        [
+                            (match, generic_cover)
+                            for match in matches
+                        ],
                     )
-                    final_matches.append(match)
                 return final_matches
             return matches
 
@@ -146,46 +147,6 @@ class LubimyCzytac(Metadata):
             return ""
         return f"{LubimyCzytac.BASE_URL}/szukaj/ksiazki?phrase={query}"
 
-    @staticmethod
-    def get_title_tokens(
-        title: str, strip_joiners: bool = True
-    ) -> Generator[str, None, None]:
-        """
-        Taken from calibre source code
-        """
-        title_patterns = [
-            (re.compile(pat, re.IGNORECASE), repl)
-            for pat, repl in [
-                # Remove things like: (2010) (Omnibus) etc.
-                (
-                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|"
-                    r"audiobook|audio\scd|paperback|turtleback|"
-                    r"mass\s*market|edition|ed\.)[\])}]",
-                    "",
-                ),
-                # Remove any strings that contain the substring edition inside
-                # parentheses
-                (r"(?i)[({\[].*?(edition|ed.).*?[\]})]", ""),
-                # Remove commas used a separators in numbers
-                (r"(\d+),(\d+)", r"\1\2"),
-                # Remove hyphens only if they have whitespace before them
-                (r"(\s-)", " "),
-                # Replace other special chars with a space
-                (r"""[:,;!@$%^&*(){}.`~"\s\[\]/]《》「」“”""", " "),
-            ]
-        ]
-
-        for pat, repl in title_patterns:
-            title = pat.sub(repl, title)
-
-        tokens = title.split()
-        for token in tokens:
-            token = token.strip().strip('"').strip("'")
-            if token and (
-                not strip_joiners or token.lower() not in ("a", "and", "the", "&")
-            ):
-                yield token
-
 
 class LubimyCzytacParser:
     PAGES_TEMPLATE = "<p id='strony'>Książka ma {0} stron(y).</p>"
@@ -232,8 +193,9 @@ class LubimyCzytacParser:
         return matches
 
     def parse_single_book(
-        self, match: Dict, response, generic_cover: str
+        self, match: Dict, generic_cover: str
     ) -> MetaRecord:
+        response = requests.get(match.get("url"))
         self.root = fromstring(response.text)
         match["series"], match["series_index"] = self._parse_series()
         match["tags"] = self._parse_tags()
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index e837fe21..7d9b6e05 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -16,25 +16,23 @@
 #  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 os
-import json
-import importlib
-import sys
-import inspect
-import datetime
 import concurrent.futures
+import importlib
+import inspect
+import json
+import os
+import sys
 
-from flask import Blueprint, request, Response, url_for
+from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
 from flask_login import login_required
+from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
-from sqlalchemy.exc import OperationalError, InvalidRequestError
 
-from . import constants, logger, ub
 from cps.services.Metadata import Metadata
+from . import constants, logger, ub
 
-
-meta = Blueprint('metadata', __name__)
+meta = Blueprint("metadata", __name__)
 
 log = logger.create()
 
@@ -42,7 +40,7 @@ new_list = list()
 meta_dir = os.path.join(constants.BASE_DIR, "cps", "metadata_provider")
 modules = os.listdir(os.path.join(constants.BASE_DIR, "cps", "metadata_provider"))
 for f in modules:
-    if os.path.isfile(os.path.join(meta_dir, f)) and not f.endswith('__init__.py'):
+    if os.path.isfile(os.path.join(meta_dir, f)) and not f.endswith("__init__.py"):
         a = os.path.basename(f)[:-3]
         try:
             importlib.import_module("cps.metadata_provider." + a)
@@ -51,34 +49,46 @@ for f in modules:
             log.error("Import error for metadata source: {}".format(a))
             pass
 
+
 def list_classes(provider_list):
     classes = list()
     for element in provider_list:
-        for name, obj in inspect.getmembers(sys.modules["cps.metadata_provider." + element]):
-            if inspect.isclass(obj) and name != "Metadata" and issubclass(obj, Metadata):
+        for name, obj in inspect.getmembers(
+            sys.modules["cps.metadata_provider." + element]
+        ):
+            if (
+                inspect.isclass(obj)
+                and name != "Metadata"
+                and issubclass(obj, Metadata)
+            ):
                 classes.append(obj())
     return classes
 
+
 cl = list_classes(new_list)
 
+
 @meta.route("/metadata/provider")
 @login_required
 def metadata_provider():
-    active = current_user.view_settings.get('metadata', {})
+    active = current_user.view_settings.get("metadata", {})
     provider = list()
     for c in cl:
         ac = active.get(c.__id__, True)
-        provider.append({"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__})
-    return Response(json.dumps(provider), mimetype='application/json')
+        provider.append(
+            {"name": c.__name__, "active": ac, "initial": ac, "id": c.__id__}
+        )
+    return Response(json.dumps(provider), mimetype="application/json")
 
-@meta.route("/metadata/provider", methods=['POST'])
-@meta.route("/metadata/provider/<prov_name>", methods=['POST'])
+
+@meta.route("/metadata/provider", methods=["POST"])
+@meta.route("/metadata/provider/<prov_name>", methods=["POST"])
 @login_required
 def metadata_change_active_provider(prov_name):
     new_state = request.get_json()
-    active = current_user.view_settings.get('metadata', {})
-    active[new_state['id']] = new_state['value']
-    current_user.view_settings['metadata'] = active
+    active = current_user.view_settings.get("metadata", {})
+    active[new_state["id"]] = new_state["value"]
+    current_user.view_settings["metadata"] = active
     try:
         try:
             flag_modified(current_user, "view_settings")
@@ -91,27 +101,26 @@ def metadata_change_active_provider(prov_name):
     if "initial" in new_state and prov_name:
         for c in cl:
             if c.__id__ == prov_name:
-                data = c.search(new_state.get('query', ""))
+                data = c.search(new_state.get("query", ""))
                 break
-        return Response(json.dumps(data), mimetype='application/json')
+        return Response(json.dumps(data), mimetype="application/json")
     return ""
 
-@meta.route("/metadata/search", methods=['POST'])
+
+@meta.route("/metadata/search", methods=["POST"])
 @login_required
 def metadata_search():
-    query = request.form.to_dict().get('query')
+    query = request.form.to_dict().get("query")
     data = list()
-    active = current_user.view_settings.get('metadata', {})
+    active = current_user.view_settings.get("metadata", {})
     if query:
-        static_cover = url_for('static', filename='generic_cover.jpg')
+        static_cover = url_for("static", filename="generic_cover.jpg")
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-            meta = {executor.submit(c.search, query, static_cover): c for c in cl if active.get(c.__id__, True)}
+            meta = {
+                executor.submit(c.search, query, static_cover): c
+                for c in cl
+                if active.get(c.__id__, True)
+            }
             for future in concurrent.futures.as_completed(meta):
                 data.extend(future.result())
-    return Response(json.dumps(data), mimetype='application/json')
-
-
-
-
-
-
+    return Response(json.dumps(data), mimetype="application/json")
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index 17a9e38e..1464411a 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -16,7 +16,8 @@
 #  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 abc
-from typing import Dict, List, Optional, TypedDict, Union
+import re
+from typing import Dict, Generator, List, Optional, TypedDict, Union
 
 
 class Metadata:
@@ -30,9 +31,49 @@ class Metadata:
         self.active = state
 
     @abc.abstractmethod
-    def search(self, query: str, generic_cover: str):
+    def search(self, query: str, generic_cover: str = ""):
         pass
 
+    @staticmethod
+    def get_title_tokens(
+        title: str, strip_joiners: bool = True
+    ) -> Generator[str, None, None]:
+        """
+        Taken from calibre source code
+        """
+        title_patterns = [
+            (re.compile(pat, re.IGNORECASE), repl)
+            for pat, repl in [
+                # Remove things like: (2010) (Omnibus) etc.
+                (
+                    r"(?i)[({\[](\d{4}|omnibus|anthology|hardcover|"
+                    r"audiobook|audio\scd|paperback|turtleback|"
+                    r"mass\s*market|edition|ed\.)[\])}]",
+                    "",
+                ),
+                # Remove any strings that contain the substring edition inside
+                # parentheses
+                (r"(?i)[({\[].*?(edition|ed.).*?[\]})]", ""),
+                # Remove commas used a separators in numbers
+                (r"(\d+),(\d+)", r"\1\2"),
+                # Remove hyphens only if they have whitespace before them
+                (r"(\s-)", " "),
+                # Replace other special chars with a space
+                (r"""[:,;!@$%^&*(){}.`~"\s\[\]/]《》「」“”""", " "),
+            ]
+        ]
+
+        for pat, repl in title_patterns:
+            title = pat.sub(repl, title)
+
+        tokens = title.split()
+        for token in tokens:
+            token = token.strip().strip('"').strip("'")
+            if token and (
+                not strip_joiners or token.lower() not in ("a", "and", "the", "&")
+            ):
+                yield token
+
 
 class MetaSourceInfo(TypedDict):
     id: str

From d64589914fdf69ce78111c2a5d29a967f7a881e3 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 15:14:19 +0100
Subject: [PATCH 025/220] add series, languages and isbn to google provider

---
 cps/metadata_provider/google.py       | 104 +++++++++++++++++++-------
 cps/metadata_provider/lubimyczytac.py |  24 +++---
 cps/search_metadata.py                |   5 +-
 cps/services/Metadata.py              |  52 ++++++-------
 4 files changed, 119 insertions(+), 66 deletions(-)

diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 8be8ad74..1074fe3d 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -17,41 +17,93 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # Google Books api document: https://developers.google.com/books/docs/v1/using
+from typing import Dict, List, Optional
+from urllib.parse import quote
+
 import requests
 
-from cps.services.Metadata import Metadata
+from cps.isoLanguages import get_lang3, get_language_name
+from cps.services.Metadata import MetaRecord, Metadata
 
 
 class Google(Metadata):
     __name__ = "Google"
     __id__ = "google"
-    BASE_URL = "https://www.googleapis.com/books/v1/volumes?q="
+    DESCRIPTION = "Google Books"
+    META_URL = "https://books.google.com/"
+    BOOK_URL = "https://books.google.com/books?id="
+    SEARCH_URL = "https://www.googleapis.com/books/v1/volumes?q="
+    ISBN_TYPE = "ISBN_13"
 
-    def search(self, query, generic_cover=""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         if self.active:
             val = list()
-            result = requests.get(Google.BASE_URL + query.replace(" ","+"))
-            for r in result.json()['items']:
-                v = dict()
-                v['id'] = r['id']
-                v['title'] = r['volumeInfo']['title']
-                v['authors'] = r['volumeInfo'].get('authors', [])
-                v['description'] = r['volumeInfo'].get('description', "")
-                v['publisher'] = r['volumeInfo'].get('publisher', "")
-                v['publishedDate'] = r['volumeInfo'].get('publishedDate', "")
-                v['tags'] = r['volumeInfo'].get('categories', [])
-                v['rating'] = r['volumeInfo'].get('averageRating', 0)
-                if r['volumeInfo'].get('imageLinks'):
-                    v['cover'] = r['volumeInfo']['imageLinks']['thumbnail'].replace("http://", "https://")
-                else:
-                    # v['cover'] = "/../../../static/generic_cover.jpg"
-                    v['cover'] = generic_cover
-                v['source'] = {
-                    "id": self.__id__,
-                    "description": "Google Books",
-                    "link": "https://books.google.com/"}
-                v['url'] = "https://books.google.com/books?id=" + r['id']
-                val.append(v)
-            return val
+            title_tokens = list(self.get_title_tokens(query, strip_joiners=False))
+            if title_tokens:
+                tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+                query = "+".join(tokens)
+            results = requests.get(Google.SEARCH_URL + query)
+            for result in results.json()["items"]:
+                val.append(
+                    self._parse_search_result(
+                        result=result, generic_cover=generic_cover, locale=locale
+                    )
+                )
+                return val
 
+    def _parse_search_result(
+        self, result: Dict, generic_cover: str, locale: str
+    ) -> MetaRecord:
+        match = dict()
+        match["id"] = result["id"]
+        match["title"] = result["volumeInfo"]["title"]
+        match["authors"] = result["volumeInfo"].get("authors", [])
+        match["url"] = Google.BOOK_URL + result["id"]
+        match["cover"] = self._parse_cover(result=result, generic_cover=generic_cover)
+        match["description"] = result["volumeInfo"].get("description", "")
+        match["languages"] = self._parse_languages(result=result, locale=locale)
+        match["publisher"] = result["volumeInfo"].get("publisher", "")
+        match["publishedDate"] = result["volumeInfo"].get("publishedDate", "")
+        match["rating"] = result["volumeInfo"].get("averageRating", 0)
+        match["series"], match["series_index"] = "", 1
+        match["tags"] = result["volumeInfo"].get("categories", [])
 
+        match["source"] = {
+            "id": self.__id__,
+            "description": Google.DESCRIPTION,
+            "link": Google.META_URL,
+        }
+
+        match["identifiers"] = {
+            "google": match.get("id"),
+        }
+        match = self._parse_isbn(result=result, match=match)
+        return match
+
+    @staticmethod
+    def _parse_isbn(result: Dict, match: Dict) -> Dict:
+        identifiers = result["volumeInfo"].get("industryIdentifiers", [])
+        for identifier in identifiers:
+            if identifier.get("type") == Google.ISBN_TYPE:
+                match["identifiers"]["isbn"] = identifier.get("identifier")
+                break
+        return match
+
+    @staticmethod
+    def _parse_cover(result: Dict, generic_cover: str) -> str:
+        if result["volumeInfo"].get("imageLinks"):
+            cover_url = result["volumeInfo"]["imageLinks"]["thumbnail"]
+            return cover_url.replace("http://", "https://")
+        return generic_cover
+
+    @staticmethod
+    def _parse_languages(result: Dict, locale: str) -> List[str]:
+        language_iso2 = result.get("language", "")
+        languages = (
+            [get_language_name(locale, get_lang3(language_iso2))]
+            if language_iso2
+            else []
+        )
+        return languages
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 1d4e18e1..fd9ca4a7 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -107,7 +107,9 @@ class LubimyCzytac(Metadata):
 
     SUMMARY = "//script[@type='application/ld+json']//text()"
 
-    def search(self, query: str, generic_cover: str = "") -> Optional[List]:
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         if self.active:
             result = requests.get(self._prepare_query(title=query))
             root = fromstring(result.text)
@@ -117,10 +119,7 @@ class LubimyCzytac(Metadata):
                 with ThreadPool(processes=10) as pool:
                     final_matches = pool.starmap(
                         lc_parser.parse_single_book,
-                        [
-                            (match, generic_cover)
-                            for match in matches
-                        ],
+                        [(match, generic_cover) for match in matches],
                     )
                 return final_matches
             return matches
@@ -192,26 +191,25 @@ class LubimyCzytacParser:
             )
         return matches
 
-    def parse_single_book(
-        self, match: Dict, generic_cover: str
-    ) -> MetaRecord:
+    def parse_single_book(self, match: Dict, generic_cover: str) -> MetaRecord:
         response = requests.get(match.get("url"))
         self.root = fromstring(response.text)
-        match["series"], match["series_index"] = self._parse_series()
-        match["tags"] = self._parse_tags()
+        match["cover"] = self._parse_cover(generic_cover=generic_cover)
+        match["description"] = self._parse_description()
+        match["languages"] = self._parse_languages()
         match["publisher"] = self._parse_publisher()
         match["publishedDate"] = self._parse_from_summary(
             attribute_name="datePublished"
         )
         match["rating"] = self._parse_rating()
-        match["description"] = self._parse_description()
-        match["cover"] = self._parse_cover(generic_cover=generic_cover)
+        match["series"], match["series_index"] = self._parse_series()
+        match["tags"] = self._parse_tags()
+
         match["source"] = {
             "id": self.metadata.__id__,
             "description": self.metadata.__name__,
             "link": LubimyCzytac.BASE_URL,
         }
-        match["languages"] = self._parse_languages()
         match["identifiers"] = {
             "isbn": self._parse_isbn(),
             "lubimyczytac": match["id"],
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 7d9b6e05..a128f9ac 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -30,7 +30,7 @@ from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
 
 from cps.services.Metadata import Metadata
-from . import constants, logger, ub
+from . import constants, get_locale, logger, ub
 
 meta = Blueprint("metadata", __name__)
 
@@ -113,11 +113,12 @@ def metadata_search():
     query = request.form.to_dict().get("query")
     data = list()
     active = current_user.view_settings.get("metadata", {})
+    locale = get_locale()
     if query:
         static_cover = url_for("static", filename="generic_cover.jpg")
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
             meta = {
-                executor.submit(c.search, query, static_cover): c
+                executor.submit(c.search, query, static_cover, locale): c
                 for c in cl
                 if active.get(c.__id__, True)
             }
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index 1464411a..09fc70ce 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -20,6 +20,30 @@ import re
 from typing import Dict, Generator, List, Optional, TypedDict, Union
 
 
+class MetaSourceInfo(TypedDict):
+    id: str
+    description: str
+    link: str
+
+
+class MetaRecord(TypedDict):
+    id: Union[str, int]
+    title: str
+    authors: List[str]
+    url: str
+    cover: str
+    series: Optional[str]
+    series_index: Optional[Union[int, float]]
+    tags: Optional[List[str]]
+    publisher: Optional[str]
+    publishedDate: Optional[str]
+    rating: Optional[int]
+    description: Optional[str]
+    source: MetaSourceInfo
+    languages: Optional[List[str]]
+    identifiers: Dict[str, Union[str, int]]
+
+
 class Metadata:
     __name__ = "Generic"
     __id__ = "generic"
@@ -31,7 +55,9 @@ class Metadata:
         self.active = state
 
     @abc.abstractmethod
-    def search(self, query: str, generic_cover: str = ""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         pass
 
     @staticmethod
@@ -73,27 +99,3 @@ class Metadata:
                 not strip_joiners or token.lower() not in ("a", "and", "the", "&")
             ):
                 yield token
-
-
-class MetaSourceInfo(TypedDict):
-    id: str
-    description: str
-    link: str
-
-
-class MetaRecord(TypedDict):
-    id: Union[str, int]
-    title: str
-    authors: List[str]
-    url: str
-    cover: str
-    series: Optional[str]
-    series_index: Optional[Union[int, float]]
-    tags: Optional[List[str]]
-    publisher: Optional[str]
-    publishedDate: Optional[str]
-    rating: Optional[int]
-    description: Optional[str]
-    source: MetaSourceInfo
-    languages: Optional[List[str]]
-    identifiers: Dict[str, Union[str, int]]

From 51bf35c2e41a16032e1250a8cac252195116a147 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Mon, 13 Dec 2021 17:21:41 +0100
Subject: [PATCH 026/220] unify scholar

---
 cps/metadata_provider/comicvine.py    | 87 ++++++++++++++++-----------
 cps/metadata_provider/google.py       | 49 ++++++++-------
 cps/metadata_provider/lubimyczytac.py | 57 +++++++++---------
 cps/metadata_provider/scholar.py      | 66 +++++++++++---------
 cps/search_metadata.py                | 15 +++--
 cps/services/Metadata.py              | 32 ++++++----
 optional-requirements.txt             |  3 +
 requirements.txt                      |  3 -
 8 files changed, 172 insertions(+), 140 deletions(-)

diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 195e68f8..56618d4b 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -17,49 +17,68 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 # ComicVine api document: https://comicvine.gamespot.com/api/documentation
+from typing import Dict, List, Optional
+from urllib.parse import quote
 
 import requests
-from cps.services.Metadata import Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 
 class ComicVine(Metadata):
     __name__ = "ComicVine"
     __id__ = "comicvine"
+    DESCRIPTION = "ComicVine Books"
+    META_URL = "https://comicvine.gamespot.com/"
+    API_KEY = "57558043c53943d5d1e96a9ad425b0eb85532ee6"
+    BASE_URL = (
+        f"https://comicvine.gamespot.com/api/search?api_key={API_KEY}"
+        f"&resources=issue&query="
+    )
+    QUERY_PARAMS = "&sort=name:desc&format=json"
+    HEADERS = {"User-Agent": "Not Evil Browser"}
 
-    def search(self, query, generic_cover=""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         val = list()
-        apikey = "57558043c53943d5d1e96a9ad425b0eb85532ee6"
         if self.active:
-            headers = {
-                'User-Agent': 'Not Evil Browser'
-            }
-
-            result = requests.get("https://comicvine.gamespot.com/api/search?api_key="
-                                  + apikey + "&resources=issue&query=" + query + "&sort=name:desc&format=json", headers=headers)
-            for r in result.json()['results']:
-                seriesTitle = r['volume'].get('name', "")
-                if r.get('store_date'):
-                    dateFomers = r.get('store_date')
-                else:
-                    dateFomers = r.get('date_added')
-                v = dict()
-                v['id'] = r['id']
-                v['title'] = seriesTitle + " #" + r.get('issue_number', "0") + " - " + ( r.get('name', "") or "")
-                v['authors'] = r.get('authors', [])
-                v['description'] = r.get('description', "")
-                v['publisher'] = ""
-                v['publishedDate'] = dateFomers
-                v['tags'] = ["Comics", seriesTitle]
-                v['rating'] = 0
-                v['series'] = seriesTitle
-                v['cover'] = r['image'].get('original_url', generic_cover)
-                v['source'] = {
-                    "id": self.__id__,
-                    "description": "ComicVine Books",
-                    "link": "https://comicvine.gamespot.com/"
-                }
-                v['url'] = r.get('site_detail_url', "")
-                val.append(v)
+            title_tokens = list(self.get_title_tokens(query, strip_joiners=False))
+            if title_tokens:
+                tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+                query = "%20".join(tokens)
+            result = requests.get(
+                f"{ComicVine.BASE_URL}{query}{ComicVine.QUERY_PARAMS}",
+                headers=ComicVine.HEADERS,
+            )
+            for result in result.json()["results"]:
+                match = self._parse_search_result(
+                    result=result, generic_cover=generic_cover, locale=locale
+                )
+                val.append(match)
         return val
 
-
+    def _parse_search_result(
+        self, result: Dict, generic_cover: str, locale: str
+    ) -> MetaRecord:
+        series = result["volume"].get("name", "")
+        series_index = result.get("issue_number", 0)
+        issue_name = result.get("name", "")
+        match = MetaRecord(
+            id=result["id"],
+            title=f"{series}#{series_index} - {issue_name}",
+            authors=result.get("authors", []),
+            url=result.get("site_detail_url", ""),
+            source=MetaSourceInfo(
+                id=self.__id__,
+                description=ComicVine.DESCRIPTION,
+                link=ComicVine.META_URL,
+            ),
+            series=series,
+        )
+        match.cover = result["image"].get("original_url", generic_cover)
+        match.description = result.get("description", "")
+        match.publishedDate = result.get("store_date", result.get("date_added"))
+        match.series_index = series_index
+        match.tags = ["Comics", series]
+        match.identifiers = {"comicvine": match.id}
+        return match
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 1074fe3d..5ac3e7ee 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -23,7 +23,7 @@ from urllib.parse import quote
 import requests
 
 from cps.isoLanguages import get_lang3, get_language_name
-from cps.services.Metadata import MetaRecord, Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 
 class Google(Metadata):
@@ -56,38 +56,37 @@ class Google(Metadata):
     def _parse_search_result(
         self, result: Dict, generic_cover: str, locale: str
     ) -> MetaRecord:
-        match = dict()
-        match["id"] = result["id"]
-        match["title"] = result["volumeInfo"]["title"]
-        match["authors"] = result["volumeInfo"].get("authors", [])
-        match["url"] = Google.BOOK_URL + result["id"]
-        match["cover"] = self._parse_cover(result=result, generic_cover=generic_cover)
-        match["description"] = result["volumeInfo"].get("description", "")
-        match["languages"] = self._parse_languages(result=result, locale=locale)
-        match["publisher"] = result["volumeInfo"].get("publisher", "")
-        match["publishedDate"] = result["volumeInfo"].get("publishedDate", "")
-        match["rating"] = result["volumeInfo"].get("averageRating", 0)
-        match["series"], match["series_index"] = "", 1
-        match["tags"] = result["volumeInfo"].get("categories", [])
+        match = MetaRecord(
+            id=result["id"],
+            title=result["volumeInfo"]["title"],
+            authors=result["volumeInfo"].get("authors", []),
+            url=Google.BOOK_URL + result["id"],
+            source=MetaSourceInfo(
+                id=self.__id__,
+                description=Google.DESCRIPTION,
+                link=Google.META_URL,
+            ),
+        )
 
-        match["source"] = {
-            "id": self.__id__,
-            "description": Google.DESCRIPTION,
-            "link": Google.META_URL,
-        }
+        match.cover = self._parse_cover(result=result, generic_cover=generic_cover)
+        match.description = result["volumeInfo"].get("description", "")
+        match.languages = self._parse_languages(result=result, locale=locale)
+        match.publisher = result["volumeInfo"].get("publisher", "")
+        match.publishedDate = result["volumeInfo"].get("publishedDate", "")
+        match.rating = result["volumeInfo"].get("averageRating", 0)
+        match.series, match.series_index = "", 1
+        match.tags = result["volumeInfo"].get("categories", [])
 
-        match["identifiers"] = {
-            "google": match.get("id"),
-        }
+        match.identifiers = {"google": match.id}
         match = self._parse_isbn(result=result, match=match)
         return match
 
     @staticmethod
-    def _parse_isbn(result: Dict, match: Dict) -> Dict:
+    def _parse_isbn(result: Dict, match: MetaRecord) -> MetaRecord:
         identifiers = result["volumeInfo"].get("industryIdentifiers", [])
         for identifier in identifiers:
             if identifier.get("type") == Google.ISBN_TYPE:
-                match["identifiers"]["isbn"] = identifier.get("identifier")
+                match.identifiers["isbn"] = identifier.get("identifier")
                 break
         return match
 
@@ -100,7 +99,7 @@ class Google(Metadata):
 
     @staticmethod
     def _parse_languages(result: Dict, locale: str) -> List[str]:
-        language_iso2 = result.get("language", "")
+        language_iso2 = result["volumeInfo"].get("language", "")
         languages = (
             [get_language_name(locale, get_lang3(language_iso2))]
             if language_iso2
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index fd9ca4a7..4f6aca1e 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -27,7 +27,7 @@ from html2text import HTML2Text
 from lxml.html import HtmlElement, fromstring, tostring
 from markdown2 import Markdown
 
-from cps.services.Metadata import MetaRecord, Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 SYMBOLS_TO_TRANSLATE = (
     "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
@@ -158,61 +158,60 @@ class LubimyCzytacParser:
         self.root = root
         self.metadata = metadata
 
-    def parse_search_results(self) -> List[Dict]:
+    def parse_search_results(self) -> List[MetaRecord]:
         matches = []
         results = self.root.xpath(LubimyCzytac.BOOK_SEARCH_RESULT_XPATH)
         for result in results:
             title = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.TITLE_TEXT_PATH}",
+                      f"{LubimyCzytac.TITLE_TEXT_PATH}",
             )
 
             book_url = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.URL_PATH}",
+                      f"{LubimyCzytac.URL_PATH}",
             )
             authors = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                f"{LubimyCzytac.AUTHORS_PATH}",
+                      f"{LubimyCzytac.AUTHORS_PATH}",
                 take_first=False,
             )
             if not all([title, book_url, authors]):
                 continue
             matches.append(
-                {
-                    "id": book_url.replace(f"/ksiazka/", "").split("/")[0],
-                    "title": title,
-                    "authors": [strip_accents(author) for author in authors],
-                    "url": LubimyCzytac.BASE_URL + book_url,
-                }
+                MetaRecord(
+                    id=book_url.replace(f"/ksiazka/", "").split("/")[0],
+                    title=title,
+                    authors=[strip_accents(author) for author in authors],
+                    url=LubimyCzytac.BASE_URL + book_url,
+                    source=MetaSourceInfo(
+                        id=self.metadata.__id__,
+                        description=self.metadata.__name__,
+                        link=LubimyCzytac.BASE_URL,
+                    )
+                )
             )
         return matches
 
-    def parse_single_book(self, match: Dict, generic_cover: str) -> MetaRecord:
-        response = requests.get(match.get("url"))
+    def parse_single_book(self, match: MetaRecord, generic_cover: str) -> MetaRecord:
+        response = requests.get(match.url)
         self.root = fromstring(response.text)
-        match["cover"] = self._parse_cover(generic_cover=generic_cover)
-        match["description"] = self._parse_description()
-        match["languages"] = self._parse_languages()
-        match["publisher"] = self._parse_publisher()
-        match["publishedDate"] = self._parse_from_summary(
+        match.cover = self._parse_cover(generic_cover=generic_cover)
+        match.description = self._parse_description()
+        match.languages = self._parse_languages()
+        match.publisher = self._parse_publisher()
+        match.publishedDate = self._parse_from_summary(
             attribute_name="datePublished"
         )
-        match["rating"] = self._parse_rating()
-        match["series"], match["series_index"] = self._parse_series()
-        match["tags"] = self._parse_tags()
-
-        match["source"] = {
-            "id": self.metadata.__id__,
-            "description": self.metadata.__name__,
-            "link": LubimyCzytac.BASE_URL,
-        }
-        match["identifiers"] = {
+        match.rating = self._parse_rating()
+        match.series, match.series_index = self._parse_series()
+        match.tags = self._parse_tags()
+        match.identifiers = {
             "isbn": self._parse_isbn(),
-            "lubimyczytac": match["id"],
+            "lubimyczytac": match.id,
         }
         return match
 
diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 6e13c768..0becaef0 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -15,47 +15,53 @@
 #
 #  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 itertools
+from typing import Dict, List, Optional
+from urllib.parse import quote
 
 from scholarly import scholarly
 
-from cps.services.Metadata import Metadata
+from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
+    META_URL = "https://scholar.google.com/"
 
-    def search(self, query, generic_cover=""):
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
         val = list()
         if self.active:
-            scholar_gen = scholarly.search_pubs(' '.join(query.split('+')))
-            i = 0
-            for publication in scholar_gen:
-                v = dict()
-                v['id'] = "1234" # publication['bib'].get('title')
-                v['title'] = publication['bib'].get('title')
-                v['authors'] = publication['bib'].get('author', [])
-                v['description'] = publication['bib'].get('abstract', "")
-                v['publisher'] = publication['bib'].get('venue', "")
-                if publication['bib'].get('pub_year'):
-                    v['publishedDate'] = publication['bib'].get('pub_year')+"-01-01"
-                else:
-                    v['publishedDate'] = ""
-                v['tags'] = ""
-                v['ratings'] = 0
-                v['series'] = ""
-                v['cover'] = generic_cover
-                v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "",
-                v['source'] = {
-                    "id": self.__id__,
-                    "description": "Google Scholar",
-                    "link": "https://scholar.google.com/"
-                }
-                val.append(v)
-                i += 1
-                if (i >= 10):
-                    break
+            title_tokens = list(self.get_title_tokens(query, strip_joiners=False))
+            if title_tokens:
+                tokens = [quote(t.encode("utf-8")) for t in title_tokens]
+                query = " ".join(tokens)
+            scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
+            for result in scholar_gen:
+                match = self._parse_search_result(
+                    result=result, generic_cover=generic_cover, locale=locale
+                )
+                val.append(match)
         return val
 
+    def _parse_search_result(
+        self, result: Dict, generic_cover: str, locale: str
+    ) -> MetaRecord:
+        match = MetaRecord(
+            id=result.get("pub_url", result.get("eprint_url", "")),
+            title=result["bib"].get("title"),
+            authors=result["bib"].get("author", []),
+            url=result.get("pub_url", result.get("eprint_url", "")),
+            source=MetaSourceInfo(
+                id=self.__id__, description=self.__name__, link=scholar.META_URL
+            ),
+        )
 
-
+        match.cover = result.get("image", {}).get("original_url", generic_cover)
+        match.description = result["bib"].get("abstract", "")
+        match.publisher = result["bib"].get("venue", "")
+        match.publishedDate = result["bib"].get("pub_year") + "-01-01"
+        match.identifiers = {"scholar": match.id}
+        return match
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index a128f9ac..53cbf553 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -22,6 +22,7 @@ import inspect
 import json
 import os
 import sys
+from dataclasses import asdict
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
@@ -99,11 +100,13 @@ def metadata_change_active_provider(prov_name):
         log.error("Invalid request received: {}".format(request))
         return "Invalid request", 400
     if "initial" in new_state and prov_name:
-        for c in cl:
-            if c.__id__ == prov_name:
-                data = c.search(new_state.get("query", ""))
-                break
-        return Response(json.dumps(data), mimetype="application/json")
+        data = []
+        provider = next((c for c in cl if c.__id__ == prov_name), None)
+        if provider is not None:
+            data = provider.search(new_state.get("query", ""))
+        return Response(
+            json.dumps([asdict(x) for x in data]), mimetype="application/json"
+        )
     return ""
 
 
@@ -123,5 +126,5 @@ def metadata_search():
                 if active.get(c.__id__, True)
             }
             for future in concurrent.futures.as_completed(meta):
-                data.extend(future.result())
+                data.extend([asdict(x) for x in future.result()])
     return Response(json.dumps(data), mimetype="application/json")
diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index 09fc70ce..f4a5662c 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -16,32 +16,38 @@
 #  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 abc
+import dataclasses
+import os
 import re
-from typing import Dict, Generator, List, Optional, TypedDict, Union
+from typing import Dict, Generator, List, Optional, Union
+
+from cps import constants
 
 
-class MetaSourceInfo(TypedDict):
+@dataclasses.dataclass
+class MetaSourceInfo:
     id: str
     description: str
     link: str
 
 
-class MetaRecord(TypedDict):
+@dataclasses.dataclass
+class MetaRecord:
     id: Union[str, int]
     title: str
     authors: List[str]
     url: str
-    cover: str
-    series: Optional[str]
-    series_index: Optional[Union[int, float]]
-    tags: Optional[List[str]]
-    publisher: Optional[str]
-    publishedDate: Optional[str]
-    rating: Optional[int]
-    description: Optional[str]
     source: MetaSourceInfo
-    languages: Optional[List[str]]
-    identifiers: Dict[str, Union[str, int]]
+    cover: str = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+    description: Optional[str] = ""
+    series: Optional[str] = None
+    series_index: Optional[Union[int, float]] = 0
+    identifiers: Dict[str, Union[str, int]] = dataclasses.field(default_factory=dict)
+    publisher: Optional[str] = None
+    publishedDate: Optional[str] = None
+    rating: Optional[int] = 0
+    languages: Optional[List[str]] = dataclasses.field(default_factory=list)
+    tags: Optional[List[str]] = dataclasses.field(default_factory=list)
 
 
 class Metadata:
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 03f58bb5..17c4b878 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -32,6 +32,9 @@ SQLAlchemy-Utils>=0.33.5,<0.38.0
 # extracting metadata
 rarfile>=2.7
 scholarly>=1.2.0, <1.5
+markdown2==2.4.2
+html2text==2020.1.16
+python-dateutil==2.8.2
 
 # other
 natsort>=2.2.0,<8.1.0
diff --git a/requirements.txt b/requirements.txt
index d09c2157..1db961fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,3 @@ Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.3.0
 lxml>=3.8.0,<4.7.0
 flask-wtf>=0.14.2,<1.1.0
-markdown2==2.4.2
-html2text==2020.1.16
-python-dateutil==2.8.2

From bea14d1784184f16040e99b0259664c9d78e98c3 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Wed, 15 Dec 2021 15:20:01 +0100
Subject: [PATCH 027/220] fix locale for lubimyczytac languages

---
 cps/metadata_provider/lubimyczytac.py | 31 ++++++++++++++-------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 4f6aca1e..814a785e 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -18,7 +18,7 @@ import datetime
 import json
 import re
 from multiprocessing.pool import ThreadPool
-from typing import Dict, List, Optional, Tuple, Union
+from typing import List, Optional, Tuple, Union
 from urllib.parse import quote
 
 import requests
@@ -27,6 +27,7 @@ from html2text import HTML2Text
 from lxml.html import HtmlElement, fromstring, tostring
 from markdown2 import Markdown
 
+from cps.isoLanguages import get_language_name
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
 SYMBOLS_TO_TRANSLATE = (
@@ -119,7 +120,7 @@ class LubimyCzytac(Metadata):
                 with ThreadPool(processes=10) as pool:
                     final_matches = pool.starmap(
                         lc_parser.parse_single_book,
-                        [(match, generic_cover) for match in matches],
+                        [(match, generic_cover, locale) for match in matches],
                     )
                 return final_matches
             return matches
@@ -165,18 +166,18 @@ class LubimyCzytacParser:
             title = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                      f"{LubimyCzytac.TITLE_TEXT_PATH}",
+                f"{LubimyCzytac.TITLE_TEXT_PATH}",
             )
 
             book_url = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                      f"{LubimyCzytac.URL_PATH}",
+                f"{LubimyCzytac.URL_PATH}",
             )
             authors = self._parse_xpath_node(
                 root=result,
                 xpath=f"{LubimyCzytac.SINGLE_BOOK_RESULT_XPATH}"
-                      f"{LubimyCzytac.AUTHORS_PATH}",
+                f"{LubimyCzytac.AUTHORS_PATH}",
                 take_first=False,
             )
             if not all([title, book_url, authors]):
@@ -191,21 +192,21 @@ class LubimyCzytacParser:
                         id=self.metadata.__id__,
                         description=self.metadata.__name__,
                         link=LubimyCzytac.BASE_URL,
-                    )
+                    ),
                 )
             )
         return matches
 
-    def parse_single_book(self, match: MetaRecord, generic_cover: str) -> MetaRecord:
+    def parse_single_book(
+        self, match: MetaRecord, generic_cover: str, locale: str
+    ) -> MetaRecord:
         response = requests.get(match.url)
         self.root = fromstring(response.text)
         match.cover = self._parse_cover(generic_cover=generic_cover)
         match.description = self._parse_description()
-        match.languages = self._parse_languages()
+        match.languages = self._parse_languages(locale=locale)
         match.publisher = self._parse_publisher()
-        match.publishedDate = self._parse_from_summary(
-            attribute_name="datePublished"
-        )
+        match.publishedDate = self._parse_from_summary(attribute_name="datePublished")
         match.rating = self._parse_rating()
         match.series, match.series_index = self._parse_series()
         match.tags = self._parse_tags()
@@ -241,15 +242,15 @@ class LubimyCzytacParser:
     def _parse_publisher(self) -> Optional[str]:
         return self._parse_xpath_node(xpath=LubimyCzytac.PUBLISHER, take_first=True)
 
-    def _parse_languages(self) -> List[str]:
+    def _parse_languages(self, locale: str) -> List[str]:
         languages = list()
         lang = self._parse_xpath_node(xpath=LubimyCzytac.LANGUAGES, take_first=True)
         if lang:
             if "polski" in lang:
-                languages.append("Polish")
+                languages.append("pol")
             if "angielski" in lang:
-                languages.append("English")
-        return languages
+                languages.append("eng")
+        return [get_language_name(locale, language) for language in languages]
 
     def _parse_series(self) -> Tuple[Optional[str], Optional[Union[float, int]]]:
         series_index = 0

From b85627da5c285e07ecd7893216aef9ed7a0aca70 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 19 Dec 2021 11:29:54 +0100
Subject: [PATCH 028/220] Fix for adding/deleting visibility restrictions on
 custom columns/tags

---
 cps/admin.py              | 15 +++++++++++++--
 optional-requirements.txt |  2 +-
 setup.cfg                 |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 04d9138f..1c228e49 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -756,7 +756,12 @@ def prepare_tags(user, action, tags_name, id_list):
     return ",".join(saved_tags_list)
 
 
-@admi.route("/ajax/addrestriction/<int:res_type>", defaults={"user_id": 0}, methods=['POST'])
+@admi.route("/ajax/addrestriction/<int:res_type>", methods=['POST'])
+@login_required
+@admin_required
+def add_user_0_restriction(res_type):
+    return add_restriction(res_type, 0)
+
 @admi.route("/ajax/addrestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
@@ -803,7 +808,13 @@ def add_restriction(res_type, user_id):
     return ""
 
 
-@admi.route("/ajax/deleterestriction/<int:res_type>", defaults={"user_id": 0}, methods=['POST'])
+@admi.route("/ajax/deleterestriction/<int:res_type>", methods=['POST'])
+@login_required
+@admin_required
+def delete_user_0_restriction(res_type):
+    return delete_restriction(res_type, 0)
+
+
 @admi.route("/ajax/deleterestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 03f58bb5..3fac14ca 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -12,7 +12,7 @@ rsa>=3.4.2,<4.8.0
 six>=1.10.0,<1.17.0
 
 # Gdrive and Gmail integration
-google-api-python-client>=1.7.11,<2.32.0
+google-api-python-client>=1.7.11,<2.34.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
diff --git a/setup.cfg b/setup.cfg
index fc74a1ed..87f6055f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,7 +56,7 @@ install_requires =
 
 [options.extras_require]
 gdrive =
-    google-api-python-client>=1.7.11,<2.32.0
+    google-api-python-client>=1.7.11,<2.34.0
     gevent>20.6.0,<22.0.0
     greenlet>=0.4.17,<1.2.0
     httplib2>=0.9.2,<0.21.0
@@ -70,7 +70,7 @@ gdrive =
     six>=1.10.0,<1.17.0
 gmail =
     google-auth-oauthlib>=0.4.3,<0.5.0
-    google-api-python-client>=1.7.11,<2.32.0
+    google-api-python-client>=1.7.11,<2.34.0
 goodreads =
     goodreads>=0.3.2,<0.4.0
     python-Levenshtein>=0.12.0,<0.13.0

From d45085215f231533ae62749f0e74c637b2168faa Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 22 Dec 2021 19:05:41 +0100
Subject: [PATCH 029/220] Update Translation

---
 cps/iso_language_names.py                     |  41 ----
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 39546 -> 39546 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 53605 -> 56158 bytes
 cps/translations/de/LC_MESSAGES/messages.po   | 212 +++++++++---------
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 57741 -> 57741 bytes
 cps/translations/el/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 51330 -> 51330 bytes
 cps/translations/es/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 27430 -> 27430 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 53669 -> 53669 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 25180 -> 25180 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 56299 -> 56299 bytes
 cps/translations/it/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 19843 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 24546 -> 24546 bytes
 cps/translations/km/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 50497 -> 50497 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 52413 -> 52413 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   | 148 ++++++------
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 46930 -> 46930 bytes
 .../pt_BR/LC_MESSAGES/messages.po             | 148 ++++++------
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 47969 -> 47969 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 48760 -> 48760 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22790 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   | 148 ++++++------
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 18028 -> 18028 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   | 148 ++++++------
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 50104 -> 50104 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 148 ++++++------
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 48886 -> 48886 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        | 148 ++++++------
 messages.pot                                  | 148 ++++++------
 40 files changed, 1507 insertions(+), 1558 deletions(-)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index c6267ffd..11e5e67b 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -55,7 +55,6 @@ LANGUAGE_NAMES = {
         "bik": "bikolština",
         "bin": "bini",
         "bis": "bislamština",
-        "bit": "berinomo",
         "bla": "siksika",
         "bod": "tibetština",
         "bos": "bosenština",
@@ -164,7 +163,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligayonština",
         "hin": "hindština",
         "hit": "chetitština",
-        "hmj": "Ge",
         "hmn": "hmongština",
         "hmo": "hiri motu",
         "hrv": "chorvatština",
@@ -479,7 +477,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Blackfoot",
         "bod": "Tibetisch",
         "bos": "Bosnisch",
@@ -588,7 +585,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hethitisch",
-        "hmj": "Ge",
         "hmn": "Miao-Sprachen",
         "hmo": "Hiri-Motu",
         "hrv": "Kroatisch",
@@ -898,7 +894,6 @@ LANGUAGE_NAMES = {
         "bel": "Λευκωρωσικά",
         "bem": "Bemba (Zambia)",
         "ben": "Μπενγκάλι",
-        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -973,7 +968,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Γεωργιανά",
         "deu": "Γερμανικά",
@@ -1282,7 +1276,6 @@ LANGUAGE_NAMES = {
         "bik": "Bicolano",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksiká",
         "bod": "Tibetano",
         "bos": "Bosnio",
@@ -1391,7 +1384,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainón",
         "hin": "Hindi",
         "hit": "Hitita",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croata",
@@ -1706,7 +1698,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
-        "bit": "Berinomo",
         "bla": "mustajalka (siksika)",
         "bod": "tiibetti",
         "bos": "bosnia",
@@ -1815,7 +1806,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "heetti",
-        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri-motu",
         "hrv": "kroatia",
@@ -2130,7 +2120,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
-        "bit": "berinomo",
         "bla": "pied-noir",
         "bod": "tibétain",
         "bos": "bosniaque",
@@ -2239,7 +2228,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "hittite",
-        "hmj": "ge",
         "hmn": "hmong",
         "hmo": "hiri Motu",
         "hrv": "croate",
@@ -2554,7 +2542,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "biszlama",
-        "bit": "Berinomo",
         "bla": "szikszika",
         "bod": "tibeti",
         "bos": "bosnyák",
@@ -2663,7 +2650,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hettita",
-        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "horvát",
@@ -2978,7 +2964,6 @@ LANGUAGE_NAMES = {
         "bik": "bicol",
         "bin": "Bini",
         "bis": "bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetano",
         "bos": "Bosniaco",
@@ -3087,7 +3072,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligayna",
         "hin": "Hindi",
         "hit": "hittite",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croato",
@@ -3402,7 +3386,6 @@ LANGUAGE_NAMES = {
         "bik": "ビコル語",
         "bin": "ビニ語",
         "bis": "ビスラマ語",
-        "bit": "Berinomo",
         "bla": "ブラックフット語",
         "bod": "チベット語",
         "bos": "ボスニア語",
@@ -3511,7 +3494,6 @@ LANGUAGE_NAMES = {
         "hil": "ヒリジャノン語",
         "hin": "ヒンディー語",
         "hit": "ヒッタイト語",
-        "hmj": "Ge",
         "hmn": "フモング語",
         "hmo": "ヒリモトゥ語",
         "hrv": "クロアチア語",
@@ -3826,7 +3808,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -3935,7 +3916,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
@@ -4250,7 +4230,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini; Edo",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetaans",
         "bos": "Bosnisch",
@@ -4359,7 +4338,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainoons",
         "hin": "Hindi",
         "hit": "Hittitisch",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatisch",
@@ -4674,7 +4652,6 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "edo",
         "bis": "bislama",
-        "bit": "Berinomo",
         "bla": "siksika",
         "bod": "tybetański",
         "bos": "bośniacki",
@@ -4783,7 +4760,6 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hetycki",
-        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "chorwacki",
@@ -5093,7 +5069,6 @@ LANGUAGE_NAMES = {
         "bel": "Belarusian",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
-        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -5168,7 +5143,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgiano",
         "deu": "Alemão",
@@ -5475,7 +5449,6 @@ LANGUAGE_NAMES = {
         "bik": "Бикольский",
         "bin": "Бини",
         "bis": "Бислама",
-        "bit": "Berinomo",
         "bla": "Сиксика",
         "bod": "Тибетский",
         "bos": "Боснийский",
@@ -5584,7 +5557,6 @@ LANGUAGE_NAMES = {
         "hil": "Хилигайнон",
         "hin": "Хинди",
         "hit": "Хиттит",
-        "hmj": "Ge",
         "hmn": "Хмонг",
         "hmo": "Хири Моту",
         "hrv": "Хорватский",
@@ -5899,7 +5871,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Edo (bini)",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika (svartfotindianernas språk)",
         "bod": "Tibetanska",
         "bos": "Bosniska",
@@ -6008,7 +5979,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hettitiska språk",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatiska",
@@ -6318,7 +6288,6 @@ LANGUAGE_NAMES = {
         "bel": "Beyaz Rusça",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalce",
-        "bit": "Berinomo",
         "bho": "Bhojpuri (Hindistan)",
         "bik": "Bikol (Filipinler)",
         "byn": "Bilin",
@@ -6393,7 +6362,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda Dili",
         "gay": "Gayo (Sumatra)",
         "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
-        "hmj": "Ge",
         "gez": "Geez (Etiyopya)",
         "kat": "Gürcüce",
         "deu": "Almanca",
@@ -6700,7 +6668,6 @@ LANGUAGE_NAMES = {
         "bik": "бікольська",
         "bin": "біні",
         "bis": "біслама",
-        "bit": "беріномо",
         "bla": "сісіка",
         "bod": "тибетська",
         "bos": "боснійська",
@@ -6809,7 +6776,6 @@ LANGUAGE_NAMES = {
         "hil": "хілігайнон",
         "hin": "хінді",
         "hit": "хетська",
-        "hmj": "ге",
         "hmn": "хмонг",
         "hmo": "хірімоту",
         "hrv": "хорватська",
@@ -7124,7 +7090,6 @@ LANGUAGE_NAMES = {
         "bik": "比科尔语",
         "bin": "比尼语",
         "bis": "比斯拉马语",
-        "bit": "Berinomo",
         "bla": "西克西卡语",
         "bod": "藏语",
         "bos": "波斯尼亚语",
@@ -7233,7 +7198,6 @@ LANGUAGE_NAMES = {
         "hil": "希利盖农语",
         "hin": "印地语",
         "hit": "赫梯语",
-        "hmj": "亻革家语、重安江苗语",
         "hmn": "苗语",
         "hmo": "希里莫图语",
         "hrv": "克罗地亚语",
@@ -7543,7 +7507,6 @@ LANGUAGE_NAMES = {
         "bel": "白俄羅斯文",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
-        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -7618,7 +7581,6 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
-        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgian",
         "deu": "德文",
@@ -7925,7 +7887,6 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
-        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -7960,7 +7921,6 @@ LANGUAGE_NAMES = {
         "cre": "Cree",
         "crh": "Turkish; Crimean",
         "csb": "Kashubian",
-        "csl": "Chinese Sign Language",
         "cym": "Welsh",
         "dak": "Dakota",
         "dan": "Danish",
@@ -8035,7 +7995,6 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
-        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index c77a5c217131a2e988c551ff63cd7155744ce307..3733c6c4e23a2c3ed78a08e9ba5ea3edb538486a 100644
GIT binary patch
delta 30
mcmeyhh3VH8rVY;`IE;)G3@xn;%r?J^uwi7h*sLAp?*IVBQwtja

delta 30
mcmeyhh3VH8rVY;`I1Eh`49%@f4L84wuwi7h+^ikt?*IVBPzxIX

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index f835c699..581af829 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-06-09 21:11+0100\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Uživatel admin"
 msgid "All"
 msgstr "Vše"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
@@ -92,7 +92,7 @@ msgstr "Zobrazit vše"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
@@ -208,279 +208,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json není nakonfigurováno pro webové aplikace"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění zápisového souboru není platné. Určete prosím platnou polohu"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění zápisového souboru pro přístup není platné. Určete prosím platnou polohu"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Prosím zadejte LDAP poskytovatele, port, DN a Identifikátor objektu uživatele"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr objektů skupiny LDAP musí mít jeden “%s” formátový identifikátor"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr uživatelských objektů LDAP musí mít jeden “%s” formátový identifikátor"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění databáze není platné, opravte prosím cestu"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Databáze není zapisovatelná"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění souboru klíčů není platné, zadejte prosím správnou cestu"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění certifikátu není platné, zadejte prosím správnou cestu"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Při odesílání zkušebního e-mailu došlo k chybě: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizace dokončena, klepněte na tlačítko OK a znovu načtěte stránku"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1342,7 +1342,7 @@ msgstr "Převedený soubor nebyl nalezen nebo více než jeden soubor ve složce
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Převaděč eknih selhal: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2581,7 +2581,7 @@ msgstr "Chyba"
 msgid "Upload done, processing, please wait..."
 msgstr "Nahrávání hotovo, zpracovávám, čekejte prosím..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Nastavení"
@@ -2732,7 +2732,7 @@ msgstr "Calibre-Web katalog eknih"
 msgid "epub Reader"
 msgstr "Čtečka PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Po otevření postranních panelů přeformátujte text."
 
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 6721cea96ee9ae1f50721065e05b4216ed1dbe0e..ae7fbfcfd0a44656a9805698eee5cd981eb806fa 100644
GIT binary patch
delta 13959
zcma*sd3==By~pt<Bw-0#0)zk|@DP?Hgs_A?>`MSylwD;JC&`m!U^0U<lLW9hr3#9o
zC<C}5sGx$PfP-mNz_bCeASzlFmrK<u#nRd;SH-$;Ki{0kSKHe^?(M7B_c>>tIp=qN
z=Xaioy`McAf3_w*a<)yv7K{IU-pH~#V@aBN|NPJ1zLuq-r*Qxt!|wPk_QCXi=6h4H
z4SmP$uRxpr7UaKH4gctc=iGkF{+89$vLe<f8uR#I63)kMI2<qHFwA4sL@dQI=))$s
z7vu3DD!^LI!Z$DpFJUW;&$p}=*aq8SSJZQZ8pb1*wTOlu^fnAw)(X^uYf%&3;kp&|
z+#}c;_oD)+Lp^^K703x}gP)+D`x-S*;y{zBWXz<Whb>v(nn^=nxDHeC2296WQIYS&
zPPiZS+(~3k>nt|IltE@Z9Z9Lx7ZvDGY=@Ju1Q((*TZbd@9~hZIW9VSZnuBX`8or0u
zVb39!H63rkTs)24@JG}Rx(>Ch_Bb9@3)iAHuns%oHf)SF*c=aIGX4&AgzpdK{L^TB
z!hllr4@|&B4!$iWq554=8R?G7$QZP7I%=T`)c0>io$V%6z%L+WWSv6=n8x-Ca3Zn?
zD>9t?>+EV6&;*At507IGevR5uSH5*M4n_rhCw9We+<qN)q<;o8@GI<u$s^43xv2gG
z)X`jr=~xk=(UZn{RI2u&9;`v7`ZQ+aMeKo{Ik?F<4pVSF>bVC|0USmJ_%3?zZ*G6q
zC^Nqob$yqkHXPYZLksRe71s;Mrma(`>TNRGERcpeyW!Xlr=p%;f(j&v<M0+#s$WKB
z_9E)YzC#sfWA1QEY>lcvD}#n6o{d~ts~Gi#EvSVaMSbDdsGT1}6;sQxq!T-$&U`Vd
zDA!_V+>HwG7?K3*3~Js~qSO&&VhZb9188W%38)=kg{)yMK`p!kxoOtZsG|HB_59bU
z;*1+_Zb4(z5oBOj9E!^9)u;^yu?yaenfNGnV}0uw4W0d;P!oUQ`VUk<joGGB+#Xd6
z**F_#;T5<Gm8maK3&u}0^K?N4*xT**LuFtDHo++v(F<fI4Nb5Bbw&YH5v{;JcsJ@c
z97d)3PpIcw7n+Q8zz+2Lpxy_Cs2wjt9YqByu-j4VJ%*ZpUm^L|SsZ78;H`I1{Z5n2
zL^-Hbjzy*JdQ>10?1p<V0Z*b9cmtKG3#fp8#O~OBvN@UpRA6&49i7SKUuV3A0iEqe
z)P3LS`aCM)*HOjv9_rfs1(nKgQ41zaF$=Uu&C?&X&_q<=^H2eXQ5)QdnrC~2Mq?U#
zP!sJ(1@v3g1aF{@=3`XE-=J!u%@yYJOjIBPQGt#{)zDPb_vfP)EOV`L$Jb&a<B_d2
zbQari5FSLG;pfPeWhUboR3JBDK1Na1{xT{vAE7pI5w&3AG!tk$RDeA&0|#IdUWIHl
zVlAMdFP5V+u?n+r4d&q<)b)E8RSV6hn_G~Jz39(%y%Dv*qpo$R)Stzx@JH0q&X~df
zVKM(`rTc$?h8C<t?fg9E;bo*At-LGED>{VA)cx2351;}+g1zw#%)#%mDfVPl6=z@6
zjt8RV9gWJQ50hEnT0>(1Zo&dQii7boHpjs;%~_4Zmh>m10-cAtUOv<Y*1O{euqXXj
zP#O9HlQDIc3Ah(3fMFO>QO%$+2fe6?4x<+M4E6aBsOs&&TSpGW5qKqPXSbt{ZVM{l
zZK$2^c6}Q4+_TsW52NNiKAZfvrtwDx6yZhG1PMf=;!DO9yb7sD%Y&NeDR;aEb*8Ui
zD?E#B@vo@jjGJo$PDj<o5Y*AlMIEJQF8SBMN(Or1I&6baA%8PiN3aQgi%R`vQ~)jK
znd<I<+DW$SL{tFRBlT*9@oKC?ZJ@(^b7V!RjYlFh^rqVA4(xXOwV2QNY2<gtN?;Zh
z<0Mq%8&Ge+T{r+=#<6$_^~M{1jmhX@)ck%-!&_0$@4&GbIZZ>=+U8o5>U2~F@=#|r
z7Pa%K?)WvR7soQx8Q*|8ScS^O!>A)Wgv!)wsM>fB`IEx>2vs{>7Bpmn`%j|-1J$Sn
z@5c7{0H)#r9EQhHXKXDr0kp<`bW>3a6`~fJiK?NiQ5h;m?R+gNu!m4bz7HGj{~;RM
z(MfEFr?DfRLlup+$kad=)B?RQ7xQo+UW>}aov00LLe<PRY=pZ|fj)sM@^`T_p2t+(
z|HQ@S1(J^a=}$r%tC2qetoyJ4KR~_F+FxfD9E{po0V*@IQ44xd#a!a{*Q07;18Tng
z*cUIN{{FNwmzX~&u0!qU0A7Kgp;FuLdh@Sl1*q!22ep&OP_<KoHooNg5i0d@9uru1
zR59n{ICM|}J>lX0YsV)UkUyYak$FXCrwdX2RhW*uaS|RyWu$pAe`et%)Dhf-3g~83
z(QZIpvj<$CbU%Lqm7)6Lh}qG322>P3pw6&aiHW=|YR8$V;u(V4`4qQ*E$aDYsOKtC
z8C#E9cr$9=U8veQfU2=t*HaPqflpljhPn+upo%EfF%x890{!0Da3rWIFF-v%3ANx7
z)B*wQgtxf;9oU`zK~#p$xZ{zJY3RXkuotG3n%{t7*n|G{sD;*|GH?$z#+`2eNt{Ce
z5KhL#G84!Q)Gb<!%0M+LL$_cPyblR9Vm(Yl4?Kse;@_gacpCME3#bJzyZy%H=4?Bm
z#<NiY_Cw7x0-NF#R1M5RWo(JtUy3@i6&SDI|6kD<&cHfUQPp7+{2rTPyw{|@1uC!<
zOvGH&0s~N~ALDuzY9mXq8TwIyu5iaAs6g++hJXKm(EVT!>cLv<jW40D&7V<6l(E$O
zi^DK%Mt>nHAP2Qz1T*k1)I57p&&5y+9!9-cPoR$SV~nU+F47o?O_!NejzpdP6jTN(
zP;aa%cRY$Znp)Hg=vCKGQAPFxY6074GMSGm-U8J47}UJ8eD3f60tOV>Qq((t4QfaC
zqQ3Ar+E|MU_&rnrU!b0ERAB<?fO=2#cl*;(x1$6#&uY{<8&UH-Ucvb*wJ*94yn~wX
zJT}LlP?0A2O-kG1VEUa<M>7-q;LWJo*^fDR!8J8t-u+`-1K69-cVIT2h|tKSanb#t
z{c`i;G7dFS1=@Ho>I=1~v;7!#War&}=NnAMx}%CSACqtxs+cFZ{b{K0&&SpnSxloF
zjSB3E8!-=`!>;&8v@t$tQrH9I=?}q{Sb#d)DXue60nA2a@EV+oC76u+a5UB-&qb`u
zG}<tb7&5;B9Z);F0(DlaQP*=b=HqLq6vl<kZ$uv)Kz|x)1FKO1>_lZ?4=Uh;n1Z#g
zC$P2d|A!3?{+$lB;~!9wcCIuj%ESKjN1;;b$5vS7e!do!(k-Z3+J?G@zeW|~+t>oX
zL>1#tsOQtF$SmtyU1(^+F{l8pbo+kPPFJILz8h5oAD|{ks5aNKIqE2~F$;&_T)Ymo
za10fA9k$0;P|yDXBTC6%X{6z0)C(hRg^9eI>nPM2UyFL~I@c=KyHFc=9CcfsLmj~p
zR3?t10{F!J{LiTQF0LT|3g8k0I;*6WrWR6Bfn=j@K|U(-MW~5Fs0D6BrF;$QjJIK5
zd>ECf*RdB~Le*H;Rc7b;*pB|#Rpfs-jd|_|8&OsJ5GsH@s7Pa|9oC{!cN}#DZ=-7E
zL)3GBMQ!9OxBnw5utqnUfEuGR)DM-JVG$Zi>3ny<kL%<3%LO|!-hMUbiT%;WGAzK`
zP}jB|mBG(Yujp^l#&$QE{}F32Dub0c6?dRE@MkQ?$R!#}X?V!QWPBB;W4m9P6nk(A
z{W4VQ_oFgYi{0@kD&^-<DNb8sGSwS9(I1Xoa4zb(kURb;a-<RKFpYFR_&w@O|Bj0A
z8`MGxzcLdhqf*@!mFoVeR1QWhFxqu7Dv)1bTil3RcqeA#o9^e|V}|a3tDDWQT_4Qi
zfmx^kR$_O&6;&)xp;B0fI{W6gnDI8KGtWXTn2*ZTB;+)#E3pT@ipuPlsML>Mi>z-w
zLE{=sUT5yD7iZHyf&($-R&%C>sGXLgYGW;q#~rBR`~)-bOH?LX-)3qf6_vRxY=Xm3
zwK5hPe*YJ{9|TdUTZNk7PSk@@)KTomZg>cFwr5ed<U3T6#;-Sjju+ry`a!q98)wk}
z2!~<c+f5*4x08Rpp#lsH!e5{!I)GaEJd!Od@eZ@I+g*2~0(lv2J%>7~W*f{KG!OOt
z8Q2q-qHf9Es0=-dxmdS>{5PlZ7Y0)C686GYcba$pVC+M`6lY=-saoq(_w(;jndozu
zxyF<6diqPSH`bw2egX6GA|_$4jV90m5gIC*S*WvgP?7G&0r&#yNdAJlC70dL)9*G5
z=b-|dg393is0Cg_ZR|a_{~5NV|96~#KcUu%jK9a6$y`ik;7-&FX}jC6!CCZ=V+wZM
zL`7pRPQ+E%A78>A_;*w$Q={g6l8deAhfw3cLLI?<$a)d0#x$(ssD;j;Qrdg7`5z1l
zQB{94YG;pPV|*GF=s{F1yoz1%3sk0BZ81OJy)lP=0qRIfP-njpo9h0*NJFVPirV3u
zs7!o{n&@jBgehD3w;7y-i*OgJ7UJ$T3v@v3bUZf0S=a&>qUJA0)k2j!eiPcd|98-6
zihEJ1c@F#HTd3k|bf5VnvLEWXC8+1hF%#FJ-UoZI1J<Le{zGhsjqW!ArJ;(u8!FH#
z7@0}qY8p!EZd9uGVLrZwc^LPAxzGJj6F8_HZa{s$6}9kDY=i%WO8MX2&pSP60-S=K
z7%xHvw)#QxuShpBAZt-)c^2EEwawh)cBuXURLTq8@kOXJUx^C*e$;!Q78SsUsCgSd
zWESj$I@)ol4a|Os{41hG?g!PVg>J(%+=iO?p!@k-sK`G>rSLn{88_W-`l+Z)^gsnV
z3N_zc)c49!nO=>$Ew@By45YCKZTv5sj6dOZIBAEuHjm*b`Y)mu_zu&t&BJD)zNiHX
zQ5#x-I*LlvbGM<2aF^?|sA7-Q(a=ub#9{a`j=)ZjnE$ugd>lkSiW+|f3ozkP;~2E*
zuX245mHI<ig6A+5r|qQj(Sxn=3^H%TI!{9pXY4XRkHfH#{#sP^pF|zSB~+@DA2U17
zz_IiP;b^QxU9W?vTXG1s<6}4--$E6y{kS=j$ylKKzmUdUKG=$5@d7HsK2MlGG)AIQ
zISzHEb5TdI43(K%-0|nJ7yUP|Cw_}6wv63oyf1d6KM!>z)mY8?R+NS&YQD$pbS!G3
zYfx{h2<kdMg;(HN)Vn?VN%J#32(?fFHp6L{fb%d37oa|OFbk`&F>c356B>`vh{vaK
zDjvX&_yd+;`=?AQZ^U-=*P}AB9aTgJP?@R6Tznrhu<>4VJ$s-6n24D;4|Sv~_L6^9
z|J@8I<wtQG{vMlS`=`yqnV3YsKkB&=s1#1au2_Z&;8vW8+p!S;hBI*RGv+;VGpZOL
zMt#5L8S>xo&SyYH_$iLW%Qyi??lT$rB`V^Rs5AT{F2cn9W`QE?L4Q9c<J*{x=TP5k
zeZXAbESyN+L1q5Q2n~JlSxmuqu_=D;_P;_+knpTI)6S@VHynb)QQu#VdeLk_O}qzN
z;Q^eCb*K$BjhPKhM{PLbr=bPcV`tptey|V6&_99NQPM$EZ0V>8yP>}4MHN#J+u%y<
zjT^8F{@NXX2bKEIQ5(37t#$v?o-=2Wg(|uUn1hQ^3*3q-&bv`BsLePPPr09Ws4+Y3
zhT3_5Ou%8N8W@Gzz|GhlH=}B%7O&9#KSN_W1DU@z_cnmKW?N8a^#{zx9<?R|Gf+F5
zgKaU0jc^?*@bzv#hQsLBpk7da!$H{hc{6V@&SrgUH;sJ!9#vF*Uoh2v2UgPGidwM6
zizZXKsLV`8O*j)(lxtDf>j_j~CvXU!Mg4Z99x?&WL5;7*$UqtgY4pMKsMMq$=4#<!
z)IDB<`oa#JiSM9Nn{~vbx&n3fLF7!WwWt8Lxb8t+=fkLVeupZ)Z;p_EHBw$OU+m*L
z5;ehe*XuEjei+;12GoQ*Q48-wW#qT008YB&AE4fdU!cB!$u+soyu!2VBIbi}40Ps!
zYf%$dp(gqjs;D-his%8<i|8rTgf*z~*RU)80XyJj?1&wHWBxkM#}@R9(Z=Pd&+m!Q
zP)eS{Ts(s+wuIlBYn6uzWDsg66HyCZiF0uYsz?u_p8L+VS-p9mbi^)<=b|z+71MDJ
zYMw}dhEn=VR7CfpQhxxo(_^TezJYo{okvad57Y}L{-{~F4Qf0STVgKi`@`M-MAQam
zV>~XxvAX})(-_CVBdApW5jD{T)EE962jEYr3Hu*20ggbO{Z**c7P;dAw|_GxGJZE|
z16$qkXE2riiw)zP|7jXp_;bv|FL4BRec4>6h1j3|O{f6&p^EkeR0`k5#(2*4uh<Yc
zs+N92r9A1ldA=96qdyeKu)Z~&h92C2s)74ZDLjh3@lDLZA6>IvG538I>TE-(7tJPA
z@ts6{|5HrFuTTMBLT#Y!?@Z>pV8mu%01Ztv8&wN8peDKvm61o>&tFH?$QP&`G(BNb
zn}K?MFsgR0M5VaM9bbVuf_tzV?m^v_lP5U;o-{5npf9GJG%4zd>JPytI2EtJ*;t6%
zumC^7X_)b<xiwzwO@9+A@Wa>_FJKOKI%TfkMAW!*iu@~en;FQ)Q>e(k!9LjjHS^}1
zfQ{*|!hX2M?H|Ba^lMS6KJNBUVKe$4Vsku)`u<ng62HS-Y!Z3h{H-?-wX+4N--3rx
z0lbB(a_bFqZQ7#xX_$b$Q5ouoO>rn{!Lhgkr=yPQ7|z1?QGxb3ZH_vUPh%tlSKw$|
zhk6qpbH_iyEc#vFG&`S+HvMW;#_mJa&Tmi?e}t{^94f$XP_^(qDv*@7OfmLCYAs@o
zqoI^vgDQ>{n1T;rU)+mI<p<aXKXbi=D%R$|Hvwj%GBy?Uqg9Q1ehVs~-KZm|MWy~F
zY{B~01sW=jOQ;Dm-!?C#;W&!^ji{n}9yP(IsOK+WGN!&`eujJD82Ssb1wM!hd^c)?
z&!RT=Cbq{<u?_26-_uZ0w0hUPa5|&DFa~v|OHey1M;q6nj_3(Y!=tDLKSa&*IqFEh
zMb$?8GiIJHsD2h|zJ3@{YG%+##l@(Ug>WdYL*4fys4t#DW#A+1j(@^N*!(?HL#<E?
zPs3rj6x-oWw6PY`@I6$fzI>1Tx1}-Qee-52L{;xhRPiiA1>`}cE{sXI&K<u871%CR
zs`sLPTxwijKpoW)_w)0ZN&hSCg{dFVQ_+q5fPeJNE(!#e<%H~z<1ewp0ehO)U*dD3
zqw_LiIeCe3^Rs$p`#k<Kzo){<31!*dknInIZI4~$@p(&ZeN^cwbFA!{KF1SsY{ws}
z3_5mY$O(q*a!-}lUuJuJp@3bv+!yea*g<buc{r34%j-KhVMdALbHa{2fvJjuPTti{
zQ5J!$^cUMDp0KA#^AS;LAXx0MVriw%XFjd=hRf}hfy$sgEl?D&XFHw}Cm8)rerC*<
zpPkgWqQdcqL(zLizBI-k@aGl!%Y5EYxm{fD33`gd3e4-b!``ruS=qFwGF%=A+STP=
z20|uemM!symc=HI>eMKCjuQ^Ej}UtxE~g}V^_YoGr@K3kZW>eArPNdD3)}O(A#V|L
z{QQv}D7D9v-Pl`WlH*!T2>2>1{Puj0uhNOVKlYh~=$gV)O^X92+Suet2O70-R)iIz
z?Frky=(STaVwa}uXq4r1LUwVW(pS=u`Xa{;I?H{YVyDC|sSGN?Ca&n_Y12~3R70MY
zDKScA?1O1L6WSC9s+^!*svQ;w{9*DFtDISt+QJhoF1MFCE2{&+lGu5tCZTn4&|#0H
zdwFG%&s!W_wRC9omZhCCf=&f<Fs^#BOM`(5J6ujRgvuRXX*6zG+i2a=BP~k;)&7Qa
zCSHH^`ej>N{o6=5c4pZx;*vs~I|or>&xwt$NQ&<|H&_``cS;}>4%yig$ce|E<1FXA
z7|w}JUcM}@TSMsok_1kQujnM5ishVEFt+=K`1t6;r5Q~)Mnx5SIDAK3N<%%d;h>i^
zs^X$Os<t)F&$kB*FX%rc`bt$ss{#3WZhvrY{{hj9RcE>k>)Su+pO?eqcke~RHF5m0
z*Q+PRMgHSzgh{2>@7QJahkRjgnPbmc&T*D=JH~s%B$ZA2e2(9q<E8E8gCK=Y3hCA#
zDpHTuJabXTJ3*(ooLMS4U=FXe{!p3Y&#|)Wx0aT&9iKPWb>)J@==PgBMH3^f=Y&+6
z{vwZmnOzm||LdKyef2dV7W4P9D=X}V0G9<SmUHz8X$~b)9t`-sAy3%L_f}QfPH<H<
zRmCo=Z^~%Vw4pvdK_`08?Pq3PNz~yyr{P91rM<w>HvBq<xn6c>S8}1oRff4wMUJ<E
z1T;Jl^mEHf?MY53Oyz1_ZlM!i#Tw;z9BkBW;?J=YT|<(zY0t87C2t0@6AVYw?;6#5
zqGRrvo7L#mcg@dr$Nu$u%51oZi0$$9hm_=yIfdBXyJp3;n6upDBT;&v`D0&g9MQO0
zp*CB@CZc_|ewQ@OTu8niOTTw%e02N$xyibf<qE^Dc7i32Kl;)Gy<$&3Fg<>#0{8OO
zWdXl#m0exGt30STX$i$Pui<sU3sV7+fKZte=AU$;Upy4<#Yzo_paT8ZBWQT1{qqn!
z+fO964cZeLZg9hTUVk}zh}pZI>6kXBQpYf-xZGEND8#)ga>|0<($d(e!v_;HRcGZM
zZOzo>ztt4AP+t=bY))(D9=cN*U0pwR%Kz~lH>cW;$~ELv{G8^XQ|9q$E>myO=j#vV
zjH@i=Jh=*_#Lrc*C%P|)Ri1L)gis(DCb6W{cl7q`aYg^XhhtwKeJZZwI3+a1{wXIn
zs)i7p*t(Z@{Krd0=j!45@>0=B=0s~ZcaKdz@mO3pT^z4_g6>(VoO!DRg7v$2??o?c
zOOKs98I4by)^K|YgFa7X5m)BtWupu0d&O41ekv~We_f{#&xe_WS3#NMre)me9{&Ro
Cv5?RJ

delta 11962
zcmYM(33yG{`p5B|nMjaCB9TZA5)wotK_Wt8PKX*Rii(+1(om)5gOVDmD#xs1uCaz5
zMO8~{Rzq9WqPT9&)mF7=-D>;){;d5x|NGqMe%4xN@3r3bu6OP9-g|Yo*UdFv&a1)R
z3oZV2*3+`0a6y=Q|NpOmM9WI18;CV93+v(l)bsCPFurg152Azq6->f^ung9#XIc4}
zhTU*3HnuFMb%RDa1JOL~gD+qf7N8%lKrdX6m2nf+!q3nj?_zm;hymzT-?A!UMbvX~
zsPPV{=X%=xq3FZ<))*R^Xrk?#s0T~10<J~{uoD&Fhp0e4M(z9@>bYB}c^;!O<3ZZ0
zV>AY0bJX)4F%<h_B<ovaX(+-4SOr(39^8*9coxf|CmoFkpi&xx3N#+I<1{3tRvu<z
zF?PU1_&f%sT2^};guQVmI`e2$Y+zY+umG#!EL7xMP~~t2>*7sR<iQOsD+1%u7h7OC
z%*BeBk2<=+s7$?r%1kkO<9rOkMGeWn1~xMgiQ7?`_yQex0kzN*)C3`o%$Y``0&at3
z+j<oh;9AVUFOh#+<<iWNwLra}gVdw-JSO1OH1Z!xV+#W>;AdDFBdACnMKY?NhYDmM
zR>jHo@9)~b@3H%5QAhG4YC}&j4nsK?WvU5k-WI4#7dUCe(~z;a5!>Qv48l;hqX%nY
z1m>aw8i4(9g5AG@THq1tnm$GC*wMr+SO<gYw?U@1dZ3Ed>7t<p)}qet2v)*xQ7_y>
z1@aFz$BI;zQr!i08=R;kn}MqG5~NJ5RjB#SBlT<DLOmDW)XX1;JnytJXsCE{uqAdy
z-P<LoB0PvucpVjx)y!0P2x`JksFW9=0v(Q;Z!&6!vr*rZWvBozA%$<<!4Td5D1Oxo
z^-;x`iDB3rW3W3`!Lb;PE>vJ2pi+Jw_5NksJE(;pq5|^HHb)$WUFc_FE|y>wCymQA
zG{GOJ0KCYv`ejf%tc1Ew)llDo1k@3wqP_z;sG8`Eb#W-Fx)-4`c@Xv79n`gZfZ^!V
zg8XZz(KK{c4N<9XgWB-`)Pj>y3(Q2NdKK!Zw%h&RQS*2*7=sb0Of^OY(jBYeG}H#y
zq2}MzlKd-0hZ#^r-(n5CkE-^NRwl4SjHKTTb%s4rI~jtyz7uUrPyug5)yfB`TW|!G
z$uCjsT|v!%zZLn{L}go>g{q<=uZN1T18T=ZP!qk5nqV3#kOipBtw9}$8x`nrR1Ms)
ze}9Myz^9D~Fc@{jQBE3~ARe_)W4oV&KJ<H_Qr`!4tzJi^dMh@=L$;oLG!#H{Ou=rb
z9nL~!Vl680-Kcer<Fot!9Sucx8>`|&)J}tQ%nqxfUaW(@*c5AFD@?@UsOz*0b@pel
zCjMd@nrr6GwC#z?@L24q`@fim&hR#Nz`s!uwr^(^>WSL%G}MAik!)JWFb)ITn+&C*
zHqssyaCfYYFJl>8h~8L={<szsb^o`~&=Fk5Wc(R3FeZ;1fjzMtzJofFcTs1*1{K&2
z)U7#&%FGRWJb>LOz#6EG<f7IYfeLUcR$_h2MMFii5ueAysENX#GYe#+et!W~l%s6l
z#wPSPp>}i=bwt0S0{#QFV=wY7%b=bM#IhK!{A=RsG%8>-RD{o=Cg_7IvSFx*HzTKG
z?MF@I+sTXvp^mTymdD1ZTa|+<!d|G_8iN7209DkhJCT14e8fO39z|8_J>)N^^$+@C
zT4$5;EY!jsumW~RZD5G)bkxGDkW;jF;R~qmt^)6lI;u6O_YZU-|N8KpwFmB?`hQ{y
z25}yIEv;6lqANy4ehT$PyMf8*+tsqNF&*^*8;2Ef1!}%+sP~Scp8pSKV~{i7RA(0q
zV&Fv##zNE?O~F8%ZI3TO72y`tneM~{+>Oe_HPk#$QJE^=&D2B$@(0v%plYT!Dih9S
zG!)?;)Pi4P7+%6qe1PfbM;>*y*{A?IViM+~7Mg)7zIRZyvlx}3wOARCpaQ#sI`aF-
zd`{~r4NX|CyZM3zp^By^s%WxNHP9Qiz+kL{g_w#<QJFZ6+Q8SS=P#ot-arL<8+9a=
zdzhWaW2o+bYZ|rr;YF;E#pu92$R9TA0_uAZ+0%Tvx}g>vjg@gcDl;Xh1y`erd7a%q
zfvSm9sQG@ydYJkmN1^-Qp9b}2m7;d^0CO>}mq~3AathXX48gBZJGqJavOPuz{%h+f
zFsW~j3TyzXm|w-_xE>YIZFFkK<$9Z)XJR7#LX5`cc7Gp6(!Yak(7TVxNPA49UyRDg
zr>KAqp^Ekt>Y81${n7sYf2a(3^(Ft>QG8!h6q%?q%tb~1JnHxUsNxxe+WAbozZCWS
z7SwYeqKfeZYT<8C#dZT#I}flD{%IT7&uJd0-p`nX;XIIuDx!RQya2Vsmr)B8p{jg5
z>iJ^Sf-6xAY{x2i*zW%amGXzE42AbM&sB5M(1VSzCU(YJI2M(nRj7rIpfd0kYA4t2
z{*RbL|0%Y`)&oo+b1{Pc3RDL6pfYqAwXqARK%Lj@2OgnP?m5uB7=(JE4r;+HyWa+N
zwmt3fA*cY0Pzy~!?QkaQx%sG!t+e}_QAf5Hy>$OSr_q>!qnLr#AQNE|)I=@O8}m>*
z>Wn@(47I>WRO+3!^H3XEiCSnIY6E-i@dKzp&tRbL|M&I-cd<4<{EE6Rk%P_AJcrfk
z4@FJ*7AlZMsD*Z5RXl*ccm?&`4b(!vU>N>|I>O+WOzLAXmG!O0G?c<ZjKy)NotI)1
zZm`D>qmJY*>cjK5ZRikFT#2X!I-?&BKxJ;2Jw5`<(4U6N*c^QJ&;QG5=v)5*YDdRW
z6Mcscyo)Lp|Dh&;7}WErs6cX2--mv7e-i3eEJV$-4V8g|sCm9a75z^`$-f@(d)Z7F
zfyzV@mcb_Ii><IBw#T|S6%%lq?FCGt?>Wqvg7NhGqmFJ4*4Fc=_b#FXy@r#2Js3OO
zEYty0>36mJGf^3thdx+}{<sd6;_Y^S4=T{lQK>zF)$k(5;a`}D)e6nR9Z?$};iSPe
zu%=-k7NgE=f$dU!wlJ1sd>yvK9jGtiU)T%-UNO(L$6)%MQJ?mKs0}Sd9l;6IZM%jl
za%YtylbQ|~&A?bp#>J?}PoM(0kJ|YoRKV5<vjcD2Fs#6EylpyGq@QE=dtiO~Ls6Mq
zhUInt*U-?5J5ee83{@P*QP=7^s<=Exn(I^*Ra~`E&$mPewnHYghG7hjxBJUbJKcmj
z>dUD2d|uV<;`{?>1Tv6-wJ;64Vjm2^U8smZ!)GZ(J%0^@@E6oAutu4CAC3yRx@|Mm
zk@iGA*T?pCsrx^Vh9cj9s`}lilpjE4;0P*!>-O*WP!m2x1@HuQH0541XCH=T=_jD7
zJrxyr0cxJtQ1eejr&2wQhR$>aDn+ZYCZ5D#e1O`q_h@r}gHc6P3pL&kRh&hrg(si_
zoPpZdY}9j0QK{d66>-~W@~;OEFrXbAM)l940{R9O&;?XxJjR%e_}j+gED!#n1RL@D
zm#>>z@EdFXmc*m3;Q&;oW}v>Pi_w9*#*+Um8s`~MgrVd3FB4b;U&gnvE&hRdm^I#{
z?k&urUxG^M_oxh9#~OGa>tV<Qlff3KOypw~9EiGYPA3gLSZe=p8pG({!ASfUbykrR
zO@P%<3nif@Y=TN<J5=UgL}jWkYJs7)Gf_vm0Yh*fYF+0U8u2v#wjZcD$)vb3#xni_
z*20OX46Q@$@B^%b-(owwhdSFvlg)Tj)RA^UEm(lc)JW94<B*Ixtx_6F`90gN97%Wj
zpI}!En_~Xyco?SA{}dhg8%ATuRP*OJ1zXV1LuF<jR>e|O2KS?C;B!>QzCl0T|C=<T
z82A~rBmZe8(il|AYM~~`Ks}d@I)VbMhC@+jItNw#@1cru2d3d|Y=|*$n0`KXpg$MW
zS>O7ehEh{$y7}NlVFUUJsEK-`7G8+_+xme2(9Y6k81qqqj6w%4#2UC8WAGB{{r_Pc
zRxUP~Xo^lv)R9IVEJW>WDTd;Dtcf3Eef$CIV#u5P&#st_D%Sa^-#4N%aS`>Udx(88
zV5a#SQ;2@_mtYF6no0guB<C1Vq*qbJ@(;Ga;8`Zpd`zbQ66#2nqHf1l`}gChg)gB3
zdxXkho7tuaC!jV~j4I+1Y>BI8lYbS(4F=NjF;>K+Ic5jhsD5|Ub3^etoPe$HBx>gs
z-ZE94jmq30Y^&!`#dydb{~DF?JE(bmopVj2GInMl9<`J4*c2C{s{9=K<8SDTf1^_D
z{kF+m6e=T`n1J1}HcrDb_&x^WZq!B&qXKY#OG7W-My1Sa9+i#h*b5h-Cj1@CW7T&|
zmDj}p`i)Q%w?v(7XM4N{I_M8Z1@I<n=kH)W+=g{^|F6(UV!(gCc`yU@U`woy{V)Qj
zV>p(gs(26Tx?aJu_#3KNpP~Y-QDSN#1(mTkP??;KDYyxr{qKL5Y3P3XyUYaHs0m-f
zL>!4)cqInoUQ|ZDuz!Dq3b4ikb97Bnfptd(T4?J+UDJ;+1i!~9-T(XcK)^zCogAq9
znufX+T~U$0hPu}-Q~-NW3;Y)=q2D5NrctOGO0@eqs0DkVYNil1-wbqCq_K{MCioDQ
zx|680y=eDup)&9Y!?65f^L!jCwHX+T%`p`RqXU<rZo$Xc8@-m8+tD9Y++&w;{+f6<
z11iF^s0Hq!0`gpHc2XIY`V`c2tx-kS&$bAI=ubjzU>>GpDK^3HFcU+TnIi9m8T4l?
zBmZg~WWa%c*+wllDQ=1b8Gi{w@f421AFu-Uc-Krg6syoL#XS57Tchs^^To`=%Jj#f
zGCLo&(NZUkY#JY;uFqrCb@>OiL%&ipVJPYh`=bILgI#eaW~1*)6Hr_9rvCyeW4%xd
z6=66QV*^}ik2}Aip=)ywRZPLFOcAA{#&c0sI|3uI1YgH(sEKN>HamL}_53KTgUc`l
zk76!9!E)GgjrnWZ5ve_=l}|(0Z7?eG5vVWSX!C$I1#8itk1Dp0P?<W2UU(ea;VF#3
z%4^M$C8IL92vtk#P#O6MRV$}3jP<RnG!*e8jKON_Oa_``b^2XUXEz#E-E&cA{~0#N
zuTVP+S#K7ML2V!r^;|kCb2+H_2cnK-I(A}xYdMY9_!D-(l=sa2pMom76{rc^sL0Qv
zitWFciBGX5Hr`+|F$op$ajb^duorr6H1qetSo-hdv-|%wjd%vGqh1WyWbS7ywxZu3
z{cr>7#qFp-zQHnh%kJMtz3;Kv9AyNmAB~N$5$gRyR56!qCjXlFJqC1dw_#iS1hpfd
zEoKL~s2vYOEm(|EIL{v6idpoJp+0DSTTPLLqvnf7y*C(ru?STQW44n2+B9Y{5RJR+
zAI_mte+#vPr>L{6^u9TYSX8lPV*>U>EifIua4zZtG#}gHN&ENEZDym<sEsE&X?W9U
zh^m1M)DEU#4V;fEnh!A-&to3OY&X|+IBL8EbySxz9;@vz8EA*vSSM7<i_jC_Kn3nB
zwg+~gB6edl{0Vix>+CcW_r)&s*Q4(BpQxg$^MR@MnK+uh3$<Wbx5-pIDl@H6^L0QK
z<uv4WIjwaxLKrxPDw6N9DF*K{5q3h2kH=KpiFNTNDl@?!n*XmS1*_7ZjC%fE?1bk~
znT_3TGW{|J(=Wmby8qK?D1Z{%_pluOeW-<wqKfZ#+wyx%EhN}BM!lbFTY#16kHj#X
zg_>^_YT>P@j2yrUtZyB+f4G2U>EFZ3_{cVJulaVzp~jn`s=pg*;!#)uov5OkhZS)#
z`r}5_dv1ID3smMVqcfbwQyQw~(2vYN%_d<0{l4hHLX5z-Q5o5Yb?`i@*gW=`YgHQ+
zNHS_8%~650$FA55Riryn&pqBp{?+jP*nCjJP{k9EN>N*k#7?M*hNDtC2^G)+RO+{(
zcKSJLr>8LpZ=&Y;1Iwee-z;1KH6F8{{0GvAXFwA)LiL-YcF+-ZpL<|77NEZQrKnV2
zLrruC_51@&#=lVWC4OQ8Oh=u49xAha?D64FdteIs@WWix4qW#577V4o7q#FSOvG=o
z33`8O{zzqGefk4X3opPbxDu7QeW)+r7q(xc0(M@cp(47Dk$4~VLb(Ix&t?>6(N9J_
zHxhOBlTex3gtc)GCg2aY0SC=JZ-mi|cgJ*m9aVEXkoTR|2^!k@cc_T3pmy*lDrH`u
znIa5BO_YYJfo`aY3Q-v;wtwG+s*Q7434caq)bn%md=*s9q~f#x|F5n6Ljmf+F<1@X
z#u(gzarh<b#mA@&`5!X<NYv3JVJ@a&22RCz+>gr8O;n&251ao6)C?U?1`6$gw^1qj
z1hw#E)O8CxV!miCQD-<FlW?lt--)X3z379-?EY!g8DB;n-7VDnzoCxq2|9I_en-te
zyQN}l`aMw#uR<NcY4pNtcK-%?)Bgjt^QWj=;C;+26o_N#N1%?N1Uusf^uZ^nBmDOm
z=buR<?6~=(^E^h;FF}oO$6ELkYR8pMm|AFs@$?6wYT|9w#P6fNCvH@LhfufYI4Y2<
zs2ckn6+rou<X>kUchY<?+G0KWJ+Lg!L}j4Fc0KCFy{N#>qB8XdR>jya%=0Z!f#jnv
z4#GM(9CiPfU;?gp($Iuwu_@ld+8BGvyx0--U^i6JO~D2@AG7c%2B7b06L1KscB*0!
zHbu?f5w(%Q7>MJrIy&E^p%*q|89a&F$vJf31JscOpE0*13AJEb48*ReBj}HQI2AR|
zEW2NVnr|5@BYW}Lkstv%t*bQB_~8NS-X@$i6SYL8u07VkF6fD4Pz#Pj-IgV&v;7Jk
zcnfun{k}9Aia}l5KIo65upCZCZ`QYF(@<*Wp;ER6_24dh`~YfaU!!W`66!YGu)Tvi
zqMz*F!@e@9b)agiC0cRugNt4*?Dty2D2Hh{UMYHwru$00vL5cH^&5D*DmL_YUuzKW
z?+VJ=?+(ol@^odl$Z*YRk?FqMBEZA#-)g<LYj@63_nh3#p6=dxD?MGcI_9{icU<Z1
zZq~Ih)V*)0+uOD3l@Ql2ubg(x9ue&NvuLn;_K4md?lP}F^mIp!e%ZslbIcP@_r-Bj
zJX|9uEG(1Uz>%Dm(J<Lneqz<~_0tpUC##>*picc1SL2Bnyc^f6@9$2U)W*a8<K%%p
z?o-nv16;qobKV_M;`Vg?vLMryu`u8L@xo3X?&^!{`?`9q_|rY4w6B*dYfYRxVNITw
zYuEbW?zZop@Nw7Mx;Dan_lVoa^}`pLF4w7W*R)ehT=!0ub#*vB#r^p7W)JtdvopM0
sSC?0JC64xYuRFKg!#(x<TrYR~i>EzYk1mD!zcgt0q1~ef40+A^KPxxr{r~^~

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 272328a3..10cc56e3 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
-"PO-Revision-Date: 2021-08-01 17:24+0200\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"PO-Revision-Date: 2021-12-22 19:05+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Benutzer bearbeiten"
 msgid "All"
 msgstr "Alle"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
@@ -92,7 +92,7 @@ msgstr "Zeige alle"
 msgid "Malformed request"
 msgstr "Ungültige Anfrage"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Guest Name kann nicht geändert werden"
 
@@ -100,7 +100,7 @@ msgstr "Guest Name kann nicht geändert werden"
 msgid "Guest can't have this role"
 msgstr "Guest Benutzer kann diese Rolle nicht haben"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
@@ -144,7 +144,7 @@ msgstr "Ungültige Lese Spalte"
 msgid "Invalid Restricted Column"
 msgstr "Ungültiger Spaltenname für Einschränkung"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
@@ -194,7 +194,7 @@ msgstr "Ort der Calibre Datenbank editieren?"
 
 #: cps/admin.py:594
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "Möchten Sie wirklich die Synchronisationsdatenbank von Calibre-Web löschen, um eine komplette Synchronisation zu erzwingen?"
 
 #: cps/admin.py:743
 msgid "Tag not found"
@@ -204,276 +204,273 @@ msgstr "Tag nicht gefunden"
 msgid "Invalid Action"
 msgstr "Ungültige Aktion"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} Synchronisationseinträge gelöscht"
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json ist nicht für Web Anwendungen konfiguriert"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Logdatei Pfad ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zugriffs Logdatei Pfad ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Bitte einen LDAP Server, Port, DN und Benutzer Objekt angeben"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Bitte einen LDAP Service Account und Password eingeben"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Bitte einen LDAP Service Account eingeben"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gruppen Objekt Filter benötigt genau eine \"%s\" Format Kennung"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Benutzer Objekt Filter benötigt genau eine \"%s\" Format Kennung"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Der LDAP Member User Filter benötigt genau eine \"%s\" Formatierungsmarkierung"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Member User Filter hat eine ungleiche Anzahl von geöffneten und geschlossenen Klammern"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA-Zertifikat, Zertifikat oder Key Datei ist kein gültiger Pfad"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DB Pfad ist nicht gültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Datenbank ist nicht schreibbar"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Schlüsseldatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:1335
-#, fuzzy
+#: cps/admin.py:1346
 msgid "Database Settings updated"
-msgstr "Einstellungen des E-Mail-Servers aktualisiert"
+msgstr "Datenbankeinstellung aktualisiert"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Guest Benutzer kann nicht gelöscht werden"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Benutzer kann nicht gelöscht werden, es wäre kein Admin Benutzer übrig"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account Verifikation erfolgreich"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail an %(email)s wurde zum Senden in die Warteschlange eingereiht, für das Ergebnis bitte Aufgaben überprüfen"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Es trat ein Fehler beim Versenden der Test-E-Mail auf: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1720
-#, fuzzy
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
-msgstr ""
+msgstr "Dateien konnten während des Updates nicht ausgetauscht werden"
 
-#: cps/admin.py:1745
-#, fuzzy
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
-msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
+msgstr "Mindestens ein LDAP Benutzer konnte nicht extrahiert werden"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Benutzer erfolgreich importiert"
 
@@ -513,9 +510,9 @@ msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s ist keine gültige Zahl, Eintrag wird ignoriert"
 
 #: cps/editbooks.py:490 cps/editbooks.py:954
-#, fuzzy, python-format
+#, python-format
 msgid "'%(langname)s' is not a valid language"
-msgstr "%(langname)s ist keine gültige Sprache"
+msgstr "'%(langname)s' ist keine gültige Sprache"
 
 #: cps/editbooks.py:630 cps/editbooks.py:981
 #, python-format
@@ -651,9 +648,9 @@ msgid "Send %(format)s to Kindle"
 msgstr "Sende %(format)s an Kindle"
 
 #: cps/helper.py:219 cps/tasks/convert.py:90
-#, fuzzy, python-format
+#, python-format
 msgid "%(book)s send to Kindle"
-msgstr "An Kindle senden"
+msgstr "%(book)s an Kindle senden"
 
 #: cps/helper.py:224
 msgid "The requested file could not be read. Maybe wrong permissions?"
@@ -728,7 +725,7 @@ msgstr "Nur jpg/jpeg/png/webp/bmp Dateien werden als Coverdatei unterstützt"
 
 #: cps/helper.py:651
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "Ungültiger Cover Dateiinhalt"
 
 #: cps/helper.py:655
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -1016,7 +1013,7 @@ msgstr "Das Buch wurde dem Bücherregal %(sname)s hinzugefügt"
 
 #: cps/shelf.py:126
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "Keine Erlaubnis Bücher zu diesem Bücherregal hinzuzufügen"
 
 #: cps/shelf.py:144
 #, python-format
@@ -1040,7 +1037,7 @@ msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "Sie haben keine Berechtigung um Bücher aus diesem Bücherregal zu löschen"
 
 #: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
@@ -1056,7 +1053,7 @@ msgstr "Bücherregal editieren"
 
 #: cps/shelf.py:249
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "Sie haben keine Berechtigung um öffentliche Bücherregal zu erzeugen"
 
 #: cps/shelf.py:261
 #, python-format
@@ -1332,7 +1329,7 @@ msgstr "Konvertierte Datei nicht gefunden, oder mehr als eine Datei im Pfad %(fo
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Fehler des EBook-Converters: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre fehlgeschlagen mit Fehler: %(error)s"
@@ -1755,9 +1752,8 @@ msgid "Keyword"
 msgstr "Suchbegriff"
 
 #: cps/templates/book_edit.html:233
-#, fuzzy
 msgid "Search keyword"
-msgstr " Suchbegriff "
+msgstr "Suche Schlüsselbegriff"
 
 #: cps/templates/book_edit.html:239
 msgid "Click the cover to load metadata to the form"
@@ -1865,21 +1861,19 @@ msgid "Enter Publishers"
 msgstr "Herausgeber eingeben"
 
 #: cps/templates/book_table.html:73
-#, fuzzy
 msgid "Enter comments"
-msgstr "Domainnamen eingeben"
+msgstr "Kommentare eingeben"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "Kommentare"
 
 #: cps/templates/book_table.html:77 cps/templates/book_table.html:79
 #: cps/templates/book_table.html:81 cps/templates/book_table.html:83
 #: cps/templates/book_table.html:87 cps/templates/book_table.html:89
 #: cps/templates/book_table.html:91 cps/templates/book_table.html:93
-#, fuzzy
 msgid "Enter "
-msgstr "IDs"
+msgstr "Eingeben "
 
 #: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
 msgid "Are you really sure?"
@@ -1955,7 +1949,7 @@ msgstr "Nightly"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "Trusted Hosts (Komma separiert)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
@@ -1979,7 +1973,7 @@ msgstr "Feature-Konfiguration"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr ""
+msgstr "Nicht-englische Zeichen in Titel und Autor beim Speichern auf Festplatte ersetzen"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -1987,7 +1981,7 @@ msgstr "Hochladen aktivieren"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr ""
+msgstr "(Bitte stellen Sie sicher das sie über die Upload Berechtigung verfügen)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
@@ -2274,14 +2268,12 @@ msgid "Allow Editing Public Shelves"
 msgstr "Editieren öffentlicher Bücherregale erlauben"
 
 #: cps/templates/config_view_edit.html:123
-#, fuzzy
 msgid "Default Language"
-msgstr "Sprachen ausschließen"
+msgstr "Default Sprache"
 
 #: cps/templates/config_view_edit.html:131
-#, fuzzy
 msgid "Default Visible Language of Books"
-msgstr "Zeige nur Bücher mit dieser Sprache"
+msgstr "Defaulteinstellung sichtbare Büchersprache"
 
 #: cps/templates/config_view_edit.html:147
 msgid "Default Visibilities for New Users"
@@ -2451,11 +2443,11 @@ msgstr "Benutzer ausloggem"
 
 #: cps/templates/index.html:69
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "Aufsteigend nach Downloadzahlen sortieren"
 
 #: cps/templates/index.html:70
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "Absteigend nach Downloadzahlen sortieren"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:21
@@ -2568,7 +2560,7 @@ msgstr "Fehler"
 msgid "Upload done, processing, please wait..."
 msgstr "Hochladen beendet, verarbeite Daten, bitte warten..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Einstellungen"
@@ -2717,7 +2709,7 @@ msgstr "Calibre-Web E-Book-Katalog"
 msgid "epub Reader"
 msgstr "epub-Leser"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Text umbrechen, wenn Seitenleiste geöffnet ist."
 
@@ -3071,7 +3063,7 @@ msgstr "Erzeugen/Ansehen"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "Komplettsynchronisation Kobo erzwingen"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
@@ -3150,9 +3142,8 @@ msgid "Edit Denied Column Values"
 msgstr "Erlaubte/Verbotene Calibre Spalten bearbeiten"
 
 #: cps/templates/user_table.html:142
-#, fuzzy
 msgid "Denied Column Values"
-msgstr "Verbotene Calibre Spalten"
+msgstr "Verbotene Spaltennamen"
 
 #: cps/templates/user_table.html:144
 msgid "Change Password"
@@ -3167,7 +3158,6 @@ msgid "Edit Public Shelves"
 msgstr "Öffentliche Bücherregale bearbeiten"
 
 #: cps/templates/user_table.html:152
-#, fuzzy
 msgid "Sync selected Shelves with Kobo"
 msgstr "Ausgesuchte Bücherregale mit Kobo synchronisieren"
 
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index bbafe7de47247c277900badefb9cde8cbc43c6d7..4068708c27897b675a4e7d1e2ee166871fbc2096 100644
GIT binary patch
delta 30
mcmeA@%-nmJdBfy54kIH4LrW_Iv(2;PI2jo&HZP5T(Fg#i)e7wZ

delta 30
mcmeA@%-nmJdBfy54nq?KLvt%r!_BkfI2jo&H!qEU(Fg#i(hBVW

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index c4389f7a..2afe1a0a 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Χρήστης Διαχειριστής"
 msgid "All"
 msgstr "Όλα"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
@@ -92,7 +92,7 @@ msgstr "Προβολή Όλων"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
 
@@ -208,279 +208,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Απόρριψη"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Η DB δεν μπορεί να Γραφτεί"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Προσθήκη νέου χρήστη"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Σφάλμα: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1342,7 +1342,7 @@ msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υ
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
@@ -2581,7 +2581,7 @@ msgstr "Σφάλμα"
 msgid "Upload done, processing, please wait..."
 msgstr "Το ανέβασμα έγινε, γίνεται επεξεργασία, παρακαλούμε περίμενε..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ρυθμίσεις"
@@ -2732,7 +2732,7 @@ msgstr "Calibre-Web Κατάλογος eBook"
 msgid "epub Reader"
 msgstr "PDF πρόγραμμα ανάγνωσης"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Επανάληψη ροής κειμένου όταν οι μπάρες στο πλάι είναι ανοιχτές."
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index a476236c2e4db4569fabd707fd52271759f95fda..aaa84a38823366c0be19402b88b798683e733d90 100644
GIT binary patch
delta 30
mcmZpg$lNrMdBf>^4kIH4LrW_Iv(1<D6&M*UHh(GT3kLwDlnVF&

delta 30
mcmZpg$lNrMdBf>^4nq?KLvt%r!_AlT6&M*UH-9PU3kLwDkqY<#

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 4254df10..3047167f 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -79,7 +79,7 @@ msgstr "Editar usuarios"
 msgid "All"
 msgstr "Todo"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
@@ -96,7 +96,7 @@ msgstr "Mostrar todo"
 msgid "Malformed request"
 msgstr "Petición mal formulada"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "El nombre de invitado no se puede cambiar"
 
@@ -104,7 +104,7 @@ msgstr "El nombre de invitado no se puede cambiar"
 msgid "Guest can't have this role"
 msgstr "El invitado no puede tener ese rol"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
@@ -148,7 +148,7 @@ msgstr "Columna de lectura no válida"
 msgid "Invalid Restricted Column"
 msgstr "Columna restringida no válida"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
@@ -212,279 +212,279 @@ msgstr "Etiqueta no encontrada"
 msgid "Invalid Action"
 msgstr "Acción no válida"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json no está configurado para la aplicación web"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Access Logfile no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, Introduce un proveedor LDAP, puerto, DN y el User Object Identifier"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, introduce una cuenta de servicio LDAP y su contraseña"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Por favor, introduce una cuenta de servicio LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "El filtro de usuarios LDAP necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "El filtro de LDAP \"Member User\" tiene paréntesis no coincidentes"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la clave no válidos. Por favor introduce la ruta correcta"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de la base de datos no es válida. Por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "La base de datos no es modificable"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Keyfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de Certfile no es válida, por favor, Introduce la ruta correcta"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' eliminado"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "No puedes borrar al Usuario Invitado"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Verificación de cuenta de Gmail exitosa"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Puesto en cola un correo electrónico de prueba enviado a %(email)s, por favor, comprueba el resultado en Tareas"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocurrió un error enviando el correo electrónico de prueba: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Al menos, un usuario LDAP no se ha encontrado en la base de datos"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Usuario importado con éxito"
 
@@ -1346,7 +1346,7 @@ msgstr "Archivo convertido no encontrado, o más de un archivo en el directorio
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Falló Ebook-converter: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falló con el error: %(error)s"
@@ -2585,7 +2585,7 @@ msgstr "Error"
 msgid "Upload done, processing, please wait..."
 msgstr "Carga hecha, procesando, por favor espere ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ajustes"
@@ -2736,7 +2736,7 @@ msgstr "Catálogo de ebooks de Calibre-Web"
 msgid "epub Reader"
 msgstr "Lector PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index a6a8eea22ae2015996cf9171da50daf962aad316..6493ba4325f76fbee08206f00e39284f80e0ea76 100644
GIT binary patch
delta 30
mcmZ2>jd9sE#tkL*97aY8hL%<aW}9p5r5G74Hcxlx*8%{j4hi`H

delta 30
mcmZ2>jd9sE#tkL*9EK(ehUQkLhMQ~br5G74H&1uy*8%{j3kmrE

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 5fe3845e..ae6cbd12 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -76,7 +76,7 @@ msgstr "Pääkäyttäjä"
 msgid "All"
 msgstr "Kaikki"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr "Näytä kaikki"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
@@ -209,276 +209,276 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Pääkäyttäjiä ei jää jäljelle, käyttäjää ei voi poistaa"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Testisähköpostin lähetyksessä tapahtui virhe: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Päivitys valmistui, ole hyvä ja paina OK ja lataa sivu uudelleen"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1340,7 +1340,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-kirjan muunnos epäonnistui: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2577,7 +2577,7 @@ msgstr "Virhe"
 msgid "Upload done, processing, please wait..."
 msgstr "Lataus tehty, prosessoidaan, ole hyvä ja odota..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Asetukset"
@@ -2728,7 +2728,7 @@ msgstr "Calibre-Web e-kirjaluettelo"
 msgid "epub Reader"
 msgstr "PDF lukija"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Uudelleenjärjestä teksti kun sivut on auki."
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 1c4e6de1da68267433118f1c0b12870ff2029506..ed7751543b7f4b78e543f112eedb1f6a3dcadf29 100644
GIT binary patch
delta 30
mcmZ3wn0e`9<_-1v97aY8hL%<aW}DmdIT;x(Hcu=NNdy3+;0fRW

delta 30
mcmZ3wn0e`9<_-1v9EK(ehUQkLhMU{-IT;x(H%}}ONdy3+-3j0T

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 753263fb..32ebdc2a 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -91,7 +91,7 @@ msgstr "Utilisateur admin"
 msgid "All"
 msgstr "Tout"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
@@ -108,7 +108,7 @@ msgstr "Montrer tout"
 msgid "Malformed request"
 msgstr "Demande malformée"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Le nom de l’invité ne peut pas être modifié"
 
@@ -116,7 +116,7 @@ msgstr "Le nom de l’invité ne peut pas être modifié"
 msgid "Guest can't have this role"
 msgstr "L’invité ne peut pas avoir ce rôle"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer le rôle admin"
 
@@ -160,7 +160,7 @@ msgstr "Colonne de lecture non valide"
 msgid "Invalid Restricted Column"
 msgstr "Colonne restreinte non valide"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
@@ -224,279 +224,279 @@ msgstr "Étiquette introuvable"
 msgid "Invalid Action"
 msgstr "Action invalide"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json n'est pas configuré pour l'application Web"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier logfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Access Logfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Veuillez saisir un fournisseur LDAP, Port, DN et l'identifiant objet de l'utilisateur"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Veuillez entrer un compte de service LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre objet du groupe LDAP a besoin d'un identifiant de format \"%s\""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Le filtre objet du groupe LDAP a une parenthèse non gérée"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre objet de l'utilisateur LDAP a besoin d'un identifiant de format \"%s\""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Le filtre objet de l'utilisateur LDAP a une parenthèse non gérée"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre utilisateur des membres LDAP doit avoir un identificateur de format \"%s\\ »"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Le filtre utilisateur de membre LDAP a des parenthèses non appariées"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuillez entrer le chemin correct"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Les paramètres de la base de données ne sont pas accessibles en écriture"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement de la base de données est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "La base de données n'est pas accessible en écriture"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Keyfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Certfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Impossible de supprimer l’utilisateur Invité"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "La vérification du compte Gmail réussie"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Teste les courriels en file d’attente pour l’envoi à %(email)s, veuillez vérifier le résultat des tâches"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Il y a eu une erreur pendant l’envoi du courriel de test : %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Mise à jour terminée, merci d’appuyer sur okay et de rafraîchir la page"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erreur : Aucun utilisateur renvoyé dans la réponse LDAP du serveur"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Au moins un utilisateur LDAP n'a pas été trouvé dans la base de données"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} utilisateur importé avec succès"
 
@@ -1358,7 +1358,7 @@ msgstr "Fichier converti non trouvé ou plus d'un fichier dans le chemin %(folde
 msgid "Ebook-converter failed: %(error)s"
 msgstr "La commande ebook-convert a échouée : %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre a échoué avec l’erreur : %(error)s"
@@ -2597,7 +2597,7 @@ msgstr "Erreur"
 msgid "Upload done, processing, please wait..."
 msgstr "Téléversement terminé, traitement en cours, veuillez patienter…."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Paramètres"
@@ -2748,7 +2748,7 @@ msgstr "Catalogue de livres électroniques Calibre-Web"
 msgid "epub Reader"
 msgstr "Lecteur PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Mettre à jour la mise en page du texte quand les bandeaux latéraux sont ouverts."
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 58ac79655713c9103519382572063fdfce35a686..58121e6b00bb63d7a8f3f1d9dd7e93db98673cd5 100644
GIT binary patch
delta 29
lcmca}gz?T1#tj?HIE;)G3@xn;%qH(J`_5>wd4u^HEdaFV3y=T+

delta 29
lcmca}gz?T1#tj?HI1Eh`49%@f4JYp~`_5>&d4u^HEdaFT3y=T+

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 7e6b1ed7..6012214d 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -76,7 +76,7 @@ msgstr "Rendszergazda felhasználó"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr "Mindent mutass"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
@@ -209,276 +209,276 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Hiba történt a teszt levél küldése során: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "A frissítés települt, kattints az OK-ra és újra tölt az oldal"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1340,7 +1340,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Az e-könyv átalakítás nem sikerült: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2577,7 +2577,7 @@ msgstr "Hiba"
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Beállítások"
@@ -2727,7 +2727,7 @@ msgstr "Calibre-Web e-könyv katalógus"
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index f7ef8e8940133c1e4fabd9a8f7639243a319058f..f53f178d6988a9708ba6127dbcc2aac6247f86a9 100644
GIT binary patch
delta 30
mcmaF8o%!{4<_$g-97aY8hL%<aW}8DQgc%tvHfK~eCjkJm%nF(S

delta 30
mcmaF8o%!{4<_$g-9EK(ehUQkLhMPkwgc%tvH)m8fCjkJm$qJeP

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index ae3ed927..4549a936 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -74,7 +74,7 @@ msgstr "Modifica gli utenti"
 msgid "All"
 msgstr "Tutti"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Utente non trovato"
 
@@ -91,7 +91,7 @@ msgstr "tutte le lingue presenti"
 msgid "Malformed request"
 msgstr "Richiesta non formulata correttamente"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 
@@ -99,7 +99,7 @@ msgstr "Il nome dell'utente Guest (ospite) non può essere modificato"
 msgid "Guest can't have this role"
 msgstr "L'utente Guest (ospite) non può avere questo ruolo"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di amministratore"
 
@@ -143,7 +143,7 @@ msgstr "Colonna di lettura non valida"
 msgid "Invalid Restricted Column"
 msgstr "Colonna con restrizioni non valida"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
@@ -204,273 +204,273 @@ msgstr "Etichetta non trovata"
 msgid "Invalid Action"
 msgstr "Azione non valida"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non è configurato per Web Application"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Logfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione dell'Access Logfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Per favore digita un Provider LDAP, porta, DN e User Object Identifier"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Per favore digita nome di utente e password del servizio LDAP"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Per favore indica un account di servizio LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP User Object Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Member User Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificate, il certificato o la posizione della chiave non sono corretti, per favore indica il percorso corretto"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del DB non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Il DB non è scrivibile"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Keyfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Certfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 msgid "Database Settings updated"
 msgstr "Configurazione del Database aggiornata"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Non posso eliminare l'utente Guest (ospite)"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni del server e-mail"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "L'account Gmail è stato verificato con successo"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "L'e-mail di test è stato accodato con successo per essere spedito a  %(email)s, per favore verifica tramite il pulsante 'Compito' il risultato"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Si è verificato un errore nell'invio dell'e-mail di test: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr "Durante l'aggiornamento non è stato possibile sostituire alcuni file"
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr "Fallita l'estrazione di almeno un utente LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} utente importato con successo"
 
@@ -1330,7 +1330,7 @@ msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartel
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Errore nel convertitore: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Si è verificato un errore con Calibre: %(error)s"
@@ -2562,7 +2562,7 @@ msgstr "Errore"
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurazione"
@@ -2711,7 +2711,7 @@ msgstr "Catalogo Calibre-Web"
 msgid "epub Reader"
 msgstr "Lettore epub"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Adatta il testo quando le barre laterali sono aperte."
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index afb7b8da638e2cdebe0aa2c13ad21330f93b5b73..e0ea3ef77ac4ddc2c8a45f3da5fe51e014946399 100644
GIT binary patch
delta 30
mcmZpk&DcDfaYLCFhmnzjp{139+2%SeX+}ni&9k&$DgpqJy9rkS

delta 30
mcmZpk&DcDfaYLCFhoOmrp}Cc*;pRFmX+}oN&9k&$DgpqJxCvJP

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index c8bfd79e..805e925b 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
@@ -204,276 +204,276 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1335,7 +1335,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter が失敗しました: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2571,7 +2571,7 @@ msgstr "エラー"
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設定"
@@ -2721,7 +2721,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index ffd09157b05df02247331d69602fb202cd19cf90..59d510d611b0a5f7af96521f3ae1abd8d591b1fb 100644
GIT binary patch
delta 29
lcmaE~pYhRt#tjEmIE;)G3@xn;%qE{y`OIjsd9SLf6#%ph3lIPR

delta 29
lcmaE~pYhRt#tjEmI1Eh`49%@f4JV&e`OIj!d9SLf6#%pf3lIPR

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index e867d38c..196ea2a9 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -77,7 +77,7 @@ msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr "បង្ហាញទាំងអស់"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -210,275 +210,275 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1339,7 +1339,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2575,7 +2575,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "ការកំណត់"
@@ -2725,7 +2725,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំងចំហៀង។"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 46b0374b19e4d7f4baf22424e3b5e1decea01fb2..d7e7c45ee39325b7c028cb75a234a08734bb2334 100644
GIT binary patch
delta 30
mcmX@u#eA@fdBf8}4kIH4LrW_Iv(0Y{4H+3NHp>?)1pxrEKMHOD

delta 30
mcmX@u#eA@fdBf8}4nq?KLvt%r!_99C4H+3NH_I0*1pxrEJPK|A

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 88594080..fc45d08a 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: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -77,7 +77,7 @@ msgstr "Systeembeheerder"
 msgid "All"
 msgstr "Alles"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
@@ -94,7 +94,7 @@ msgstr "Alle talen"
 msgid "Malformed request"
 msgstr "Misvormd verzoek"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Gast naam kan niet worden veranderd"
 
@@ -102,7 +102,7 @@ msgstr "Gast naam kan niet worden veranderd"
 msgid "Guest can't have this role"
 msgstr "Gast kan deze rol niet hebben"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
@@ -146,7 +146,7 @@ msgstr "Ongeldige gelezen kolom"
 msgid "Invalid Restricted Column"
 msgstr "Ongeldige beperkte kolom"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
@@ -210,278 +210,278 @@ msgstr "Tag niet gevonden"
 msgid "Invalid Action"
 msgstr "Ongeldige actie"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json is niet geconfigureerd voor webapplicatie"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "De locatie van het logbestand is onjuist, voer een geldige locatie in"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "De locatie vam het toegangslog is onjuist, voer een geldige locatie in"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Voer alsjeblieft een LDAP Provider, Port, DN en User Object Identifier in"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Voer een geldig LDAP Service Account en wachtwoord in"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Voer een LDAP Service Account in"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Groep Object Filter Moet Een \"%s\" Formaat Identificiatie hebben"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Groep Object Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gebruiker Object Filter moet \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Lid Gebruiker Filter moet een \"%s\" Formaat Identificatie hebben"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Lid Gebruiker Filter heeft een niet-gebalanceerd haakje"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsjeblieft een geldig pad in."
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "DB-instellingen niet opgeslagen"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Database niet gevonden, voer de juiste locatie in"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Kan niet schrijven naar database"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-sleutellocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldig pad in"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Kan Gast gebruiker niet verwijderen"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Gmail Account succesvol geverifieerd"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Test E-Mail wordt verzonden naar %(email)s, controleer de taken voor het resultaat"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Fout opgetreden bij het versturen van de test-e-mail: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Mislukt om minstens een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Het is niet gelukt tenminste een LDAP gebruiker aan te maken"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minstens een LDAP Gebruiker is niet gevonden in de Database"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Gebruiker succesvol geïmporteerd"
 
@@ -1343,7 +1343,7 @@ msgstr "Omgezette bestand is niet gevonden of meer dan een bestand in map %(fold
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-boek-conversie mislukt: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre mislukt met foutmelding: %(error)s"
@@ -2582,7 +2582,7 @@ msgstr "Fout"
 msgid "Upload done, processing, please wait..."
 msgstr "Uploaden voltooid, bezig met verwerken..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Instellingen"
@@ -2733,7 +2733,7 @@ msgstr "Calibre-Web - e-boekcatalogus"
 msgid "epub Reader"
 msgstr "PDF lezer"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Tekstindeling automatisch aanpassen als het zijpaneel geopend is."
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 26286b36a7d211d76960cbb277672f98a950231f..3c1424b46a39204b6817d00519046c223aca62ed 100644
GIT binary patch
delta 30
mcmdlxlX>q<<_&X-IE;)G3@xn;%r-A6N@HZS*vwtBDFOhkxC*QQ

delta 30
mcmdlxlX>q<<_&X-I1Eh`49%@f4L2_-N@HZS+{|6FDFOhkwF;~N

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 85da79f1..c7dfbcf7 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -78,7 +78,7 @@ msgstr "Edytuj użytkowników"
 msgid "All"
 msgstr "Wszystko"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
@@ -95,7 +95,7 @@ msgstr "Pokaż wszystkie"
 msgid "Malformed request"
 msgstr "Nieprawidłowo sformułowane żądanie"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Nazwa gościa nie może być zmieniona"
 
@@ -103,7 +103,7 @@ msgstr "Nazwa gościa nie może być zmieniona"
 msgid "Guest can't have this role"
 msgstr "Gość nie może pełnić tej roli"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nie można odebrać praw administratora. Brak na serwerze innego konta z prawami administratora"
 
@@ -149,7 +149,7 @@ msgstr "Nieprawidłowa kolumna odczytu"
 msgid "Invalid Restricted Column"
 msgstr "Nieprawidłowa kolumna z ograniczeniami"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
@@ -210,279 +210,279 @@ msgstr "Nie znaleziono znacznika"
 msgid "Invalid Action"
 msgstr "Nieprawidłowe działanie"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json nie został skonfigurowany dla aplikacji webowej"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika dostępu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Wprowadź dostawcę LDAP, port, nazwę wyróżniającą i identyfikator obiektu użytkownika"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Proszę wprowadzić konto i hasło usługi LDAP"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "Proszę wprowadzić konto usługi LDAP"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr obiektów grupy LDAP musi mieć jeden identyfikator formatu \"% s\""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr obiektów użytkownika LDAP musi mieć jeden identyfikator formatu \"% s\""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr użytkownika członka LDAP musi mieć jedno \"%s\" identyfikator formatu"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtr użytkownika członka LDAP ma niedopasowane nawiasy"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie jest prawidłowa, Proszę wprowadzić poprawną ścieżkę"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Ustawienia Bazy Danych nie są zapisywalne"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "Baza danych nie jest zapisywalna"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 #, fuzzy
 msgid "Can't delete Guest User"
 msgstr "Nie można usunąć użytkownika gościa"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Nie można usunąć użytkownika. Brak na serwerze innego konta z prawami administratora"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, fuzzy, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testowy e-mail czeka w kolejce do wysłania do %(email)s, sprawdź zadania, aby uzyskać wynik"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania e-maila testowego: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
 # ???
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Przynajmniej jeden użytkownik LDAP nie został znaleziony w bazie danych"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Użytkownik pomyślnie zaimportowany"
 
@@ -1347,7 +1347,7 @@ msgstr "Konwertowany plik nie został znaleziony, lub więcej niż jeden plik w
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Konwertowanie nie powiodło się: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, fuzzy, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre nie powiodło się z błędem: %(error)s"
@@ -2597,7 +2597,7 @@ msgstr "Błąd"
 msgid "Upload done, processing, please wait..."
 msgstr "Wysyłanie zakończone, przetwarzanie, proszę czekać…"
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ustawienia"
@@ -2749,7 +2749,7 @@ msgstr "Katalog e-booków Calibre-Web"
 msgid "epub Reader"
 msgstr "Czytnik PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Przepływ tekstu, gdy paski boczne są otwarte."
 
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index 23b5a33f2199bd120ac7e3f66b1b9acd46b499ad..c6efe3c2bd789c787432ed2b1b4d82a3f36684a4 100644
GIT binary patch
delta 30
mcmccgj_J}nrVTY|97aY8hL%<aW}92mY?v4=HXqEG=m!A5sSA7n

delta 30
mcmccgj_J}nrVTY|9EK(ehUQkLhMQZ`Y?v4=Hy_NH=m!A5rVD%k

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index a40a13e7..762d185f 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -73,7 +73,7 @@ msgstr "Usuário Admin"
 msgid "All"
 msgstr "Todos"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Usuário não encontrado"
 
@@ -91,7 +91,7 @@ msgstr "Mostrar tudo"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nenhum usuário administrador restante, não pode remover a função de administrador"
 
@@ -143,7 +143,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Configuração do Calibre-Web atualizada"
 
@@ -207,279 +207,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Negar"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Permita"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json não está configurado para aplicativo da web"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log não é válida, digite o caminho correto"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de log de acesso não é válida, digite o caminho correto"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Digite um provedor LDAP, porta, DN e identificador de objeto do usuário"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de grupo LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de grupo LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de objeto de usuário LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtro de objeto de usuário LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "O filtro de usuário membro do LDAP precisa ter um identificador de formato \"%s\""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Filtro de usuário de membro LDAP tem parênteses incomparáveis"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificate, Certificados ou chave de localização não é válida, Insira o caminho correto"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "O banco de dados de configurações não é gravável"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do banco de dados não é válida, digite o caminho correto"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "DB não é gravável"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo-chave não é válida, por favor insira o caminho correto"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "A localização do arquivo de certificação não é válida, digite o caminho correto"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "O e-mail não é de um domínio válido"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Adicionar novo usuário"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuário '%(user)s' criado"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Encontrei uma conta existente para este endereço de e-mail ou apelido."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuário '%(nick)s' excluído"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Nenhum usuário administrador restante, não é possível excluir o usuário"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar usuário %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Editar configurações do servidor de e-mail"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocorreu um erro ao enviar o e-mail de teste: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure seu endereço de e-mail primeiro..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Atualização das configurações do servidor de e-mail"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "visualizador de arquivo de registro"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Solicitação de pacote de atualização"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Download do pacote de atualização"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Descompactação de pacote de atualização"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Substituição de arquivos"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "As ligações à base de dados estão fechadas"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Parar servidor"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Atualização concluída, pressione okay e recarregue a página"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Atualização falhou:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Erro HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Erro de conexão"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tempo limite durante o estabelecimento da conexão"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Erro geral"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Arquivo de atualização não pôde ser salvo no diretório temporário"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Falha na criação no mínimo de um usuário LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erro: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erro: Nenhum usuário retornado em resposta do servidor LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "No mínimo um usuário LDAP não encontrado no banco de dados"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} Usuário Importado com Sucesso"
 
@@ -1341,7 +1341,7 @@ msgstr "Arquivo convertido não encontrado ou mais de um arquivo na pasta %(fold
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Conversor de ebook falhou: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre falhou com erro: %(error)s"
@@ -2580,7 +2580,7 @@ msgstr "Erro"
 msgid "Upload done, processing, please wait..."
 msgstr "Upload feito, processando, por favor aguarde ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Configurações"
@@ -2731,7 +2731,7 @@ msgstr "Catálogo de e-books Calibre-Web"
 msgid "epub Reader"
 msgstr "leitor de PDF"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Refluxo de texto quando as barras laterais estão abertas."
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 255a7fd7f9e20aaaf25b6b77c4df1b9b9b2b189f..69d9e91fa593d79d7386beda5873cec19f1012b2 100644
GIT binary patch
delta 30
mcmaF(jp^YxrVY|T97aY8hL%<aW}B6RTp1ZHHfIL^NCyD4=L*{Z

delta 30
mcmaF(jp^YxrVY|T9EK(ehUQkLhMSdxTp1ZHH)jU_NCyD4<O<sW

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 3d991d64..2eb52568 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -77,7 +77,7 @@ msgstr "Управление сервером"
 msgid "All"
 msgstr "Все"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -94,7 +94,7 @@ msgstr "Показать все"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
@@ -210,279 +210,279 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1344,7 +1344,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ошибка Ebook-конвертора: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2583,7 +2583,7 @@ msgstr "Ошибка"
 msgid "Upload done, processing, please wait..."
 msgstr "Загрузка завершена, обработка, пожалуйста, подождите..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Настройки"
@@ -2734,7 +2734,7 @@ msgstr "Каталог электронных книг Caliber-Web"
 msgid "epub Reader"
 msgstr "PDF reader"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Обновить размещение текста при открытии боковой панели."
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 8098504577ddae5887795655c87e4e0e497c7729..22c37233b6be8237799631f454937faed6473bc0 100644
GIT binary patch
delta 30
mcmezIhv~;3rVaP=IgE@H3@xn;%r-yIS7l_h*vwm)?F#_ajtkNN

delta 30
mcmezIhv~;3rVaP=ISfq{49%@f4L3i}S7l_h+{{~;?F#_aiwn{K

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index e9cfb11e..0030825f 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Redigera användare"
 msgid "All"
 msgstr "Alla"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
@@ -92,7 +92,7 @@ msgstr "Visa alla"
 msgid "Malformed request"
 msgstr "Felaktig begäran"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "Gästnamn kan inte ändras"
 
@@ -100,7 +100,7 @@ msgstr "Gästnamn kan inte ändras"
 msgid "Guest can't have this role"
 msgstr "Gäst kan inte ha den här rollen"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Ingen administratörsanvändare kvar, kan inte ta bort administratörsrollen"
 
@@ -145,7 +145,7 @@ msgstr "Ogiltig roll"
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
@@ -207,279 +207,279 @@ msgstr "Taggen hittades inte"
 msgid "Invalid Action"
 msgstr "Ogiltig åtgärd"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json är inte konfigurerad för webbapplikation"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Loggfilens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Åtkomstloggplatsens plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Vänligen ange en LDAP-leverantör, port, DN och användarobjektidentifierare"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-gruppobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-gruppobjektfilter har omatchande parentes"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP-användarobjektfilter måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP-användarobjektfilter har omatchad parentes"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Användarfilter för LDAP-medlemmar måste ha en \"%s\"-formatidentifierare"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "Användarfilter för LDAP-medlemmar har omatchad parentes"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "Inställningar för DB är inte skrivbara"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DB-plats är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "DB är inte skrivbar"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Keyfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Certfile-platsen är inte giltig, vänligen ange rätt sökväg"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "Det går inte att ta bort gästanvändaren"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 #, fuzzy
 msgid "Gmail Account Verification Successful"
 msgstr "Verifiering av G-mail-kontot lyckades"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "Testa e-post i kö för att skicka till %(email)s, vänligen kontrollera Uppgifter för resultat"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Det gick inte att skicka Testmeddelandet: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "Uppdateringsfilen kunde inte sparas i Temp Dir"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 #, fuzzy
 msgid "Failed to extract at least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Det gick inte att skapa minst en LDAP-användare"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fel: %(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fel: Ingen användare återges som svar på LDAP-servern"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Minst en LDAP-användare hittades inte i databasen"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} användare har importerats"
 
@@ -1340,7 +1340,7 @@ msgstr "Konverterad fil hittades inte eller mer än en fil i mappen %(folder)s"
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-bokkonverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "calibre misslyckades med fel: %(error)s"
@@ -2580,7 +2580,7 @@ msgstr "Fel"
 msgid "Upload done, processing, please wait..."
 msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Inställningar"
@@ -2730,7 +2730,7 @@ msgstr "Calibre-Web e-bokkatalog"
 msgid "epub Reader"
 msgstr "PDF-läsare"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Fyll i texten igen när sidofält är öppna."
 
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index fbad469794a36a215097b28241ad531de6c4e936..4354ea9aa3eb72cd7758b46d267bb21923274341 100644
GIT binary patch
delta 30
mcmZqM#Mripal=hx4kIH4LrW_Iv&|2U1sNGFHh(q|RsjH|842hB

delta 30
mcmZqM#Mripal=hx4nq?KLvt%r!_5zk1sNGFH-9z}RsjH|776G8

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 8a049549..9d6781da 100644
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr ""
 msgid "All"
 msgstr "Tümü"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
@@ -204,278 +204,278 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 #, fuzzy
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 #, fuzzy
 msgid "Found an existing account for this e-mail address or name."
 msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Deneme e-postası gönderilirken bir hata oluştu: %(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Güncelleme tamamlandı, sayfayı yenilemek için lütfen Tamam'a tıklayınız"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr "eKitap-Dönüştürücü hatası: %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2574,7 +2574,7 @@ msgstr "Hata"
 msgid "Upload done, processing, please wait..."
 msgstr "Yükleme tamamlandı, işleniyor, lütfen bekleyin..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Ayarlar"
@@ -2725,7 +2725,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr "PDF Okuyucu"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Kenar çubukları açıkken metni kaydır"
 
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index c62a20741224bb4b7ac0506a67af57add25127da..62855c0847be892c5299e2aba81e4e5efcd1c2ee 100644
GIT binary patch
delta 30
mcmaFU!}z9$al-<64kIH4LrW_Iv&}2yQyCd8HuEXQsR970Q3-Yc

delta 30
mcmaFU!}z9$al-<64nq?KLvt%r!_6z?QyCd8H}fgRsR970P6>7Z

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 4e8801da..9a4907fd 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "Керування сервером"
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -92,7 +92,7 @@ msgstr "Показати всі"
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -208,275 +208,275 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 #, fuzzy
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1337,7 +1337,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2573,7 +2573,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "Налаштування"
@@ -2723,7 +2723,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "Переформатувати текст, коли відкриті бічні панелі."
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index f7b864c06419b6c1b50a7fa22e8effca884a8167..3bbd44758668b5cf44be2dc9deef7cb3aab922ba 100644
GIT binary patch
delta 30
lcmdnd&b*_Yd4pCphmnzjp{139*=D0^bw);u%~3UR?f{t`310vJ

delta 30
lcmdnd&b*_Yd4pCphoOmrp}Cc*;bx<1bw)<Z%~3UR?f{t@310vJ

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 3986e33a..34fae630 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "管理用户"
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "找不到用户"
 
@@ -92,7 +92,7 @@ msgstr "显示全部"
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
@@ -100,7 +100,7 @@ msgstr "访客名称无法更改"
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
@@ -144,7 +144,7 @@ msgstr "无效的阅读列"
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
@@ -204,273 +204,273 @@ msgstr "标签未找到"
 msgid "Invalid Action"
 msgstr "无效的动作"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 msgid "Database Settings updated"
 msgstr "数据库设置已更新"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "无法删除游客用户"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail账号校验成功"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr "更新期间无法替换文件"
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一个LDAP用户"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能创建至少一个LDAP用户"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} 用户被成功导入"
 
@@ -1329,7 +1329,7 @@ msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
@@ -2560,7 +2560,7 @@ msgstr "错误"
 msgid "Upload done, processing, please wait..."
 msgstr "上传完成，正在处理，请稍候..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "设置"
@@ -2709,7 +2709,7 @@ msgstr "Caliebre-Web电子书路径"
 msgid "epub Reader"
 msgstr "epub阅读器"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "打开侧栏时重排文本。"
 
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 4a8c7cdda6dae1399802544661279fbb51224ac3..9f2dd7d88e9ed3c4c7bdc7ea6e0295deccf4b713 100644
GIT binary patch
delta 30
mcmezNm+9MIrVa1PIgE@H3@xn;%r<{3S7&6j*eq9h!xaG8kqmwS

delta 30
mcmezNm+9MIrVa1PISfq{49%@f4L5%)S7&6j+$>jl!xaG8jtqVP

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index a7c87e24..d9cbf08b 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -75,7 +75,7 @@ msgstr "管理用戶"
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr "找不到用戶"
 
@@ -92,7 +92,7 @@ msgstr "顯示全部"
 msgid "Malformed request"
 msgstr "格式錯誤的請求"
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr "訪客名稱無法更改"
 
@@ -100,7 +100,7 @@ msgstr "訪客名稱無法更改"
 msgid "Guest can't have this role"
 msgstr "遊客無法擁有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr "管理員賬戶不存在，無法刪除管理員角色"
 
@@ -144,7 +144,7 @@ msgstr "無效的閱讀列"
 msgid "Invalid Restricted Column"
 msgstr "無效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
@@ -204,275 +204,275 @@ msgstr "標籤未找到"
 msgid "Invalid Action"
 msgstr "無效的動作"
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒絕"
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允許"
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未為 Web 應用程序配置"
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日誌文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "訪問日誌路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "請輸入LDAP主機、端口、DN和用戶對象標識符"
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "請輸入一個LDAP服務賬號和密碼 "
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr "請輸入一個LDAP服務賬號"
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP群組對象過濾器需要一個具有“%s”格式標識符號"
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP群組對象過濾器的括號不匹配"
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用戶對象過濾器需要一個具有“%s”格式標識符"
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用戶對象過濾器的括號不匹配"
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成員用戶過濾器需要有一個“%s”格式標識符號"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成員用戶過濾器中有不匹配的括號"
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr "設置數據庫不可寫入"
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "數據庫路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr "數據庫不可寫入"
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密鑰文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "證書文件路徑無效，請輸入正確的路徑"
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 #, fuzzy
 msgid "Database Settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr "郵箱不在有效網域中"
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr "添加新用戶"
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用戶“%(user)s”已創建"
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr "使用此郵箱或用戶名的賬號已經存在。"
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用戶“%(nick)s”已刪除"
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr "無法刪除訪客用戶"
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr "管理員賬戶不存在，無法刪除用戶"
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "編輯用戶 %(nick)s"
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr "編輯郵件服務器設置"
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr "G-Mail賬號驗證成功"
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr "發送給%(email)s的測試郵件已進入隊列。請檢查任務結果"
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "發送測試郵件時出錯：%(res)s"
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr "請先配置您的郵箱地址..."
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr "郵件服務器設置已更新"
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr "日誌文件查看器"
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr "正在請求更新包"
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr "正在下載更新包"
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr "正在解壓更新包"
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr "正在替換文件"
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr "數據庫連接已關閉"
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr "正在停止服務器"
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，請點擊確定並刷新頁面"
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr "更新失敗："
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr "HTTP錯誤"
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr "連接錯誤"
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr "建立連接超時"
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr "一般錯誤"
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 #, fuzzy
 msgid "Update file could not be saved in temp dir"
 msgstr "更新文件無法保存在臨時目錄中"
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr "更新時檔案無法替換變更"
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr "未能提取至少一個LDAP用戶"
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr "未能創建至少一個LDAP用戶"
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "錯誤：%(ldaperror)s"
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr "錯誤：在LDAP服務器的響應中沒有返回用戶"
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "數據庫中沒有找到至少一個LDAP用戶"
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr "{} 用戶被成功導入"
 
@@ -1331,7 +1331,7 @@ msgstr "找不到轉換後的文件或文件夾%(folder)s中有多個文件"
 msgid "Ebook-converter failed: %(error)s"
 msgstr "電子書轉換器失敗： %(error)s"
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 運行失敗，錯誤信息：%(error)s"
@@ -2567,7 +2567,7 @@ msgstr "錯誤"
 msgid "Upload done, processing, please wait..."
 msgstr "上傳完成，正在處理中，請稍候..."
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr "設置"
@@ -2716,7 +2716,7 @@ msgstr "Caliebre-Web電子書路徑"
 msgid "epub Reader"
 msgstr "epub閱讀器"
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr "打開側欄時重排文本。"
 
diff --git a/messages.pot b/messages.pot
index 5588247f..15027461 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,14 +8,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-14 17:51+0100\n"
+"POT-Creation-Date: 2021-12-22 19:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.8.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -74,7 +74,7 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1595
+#: cps/admin.py:343 cps/admin.py:1606
 msgid "User not found"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgstr ""
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1473
+#: cps/admin.py:418 cps/admin.py:1484
 msgid "Guest Name can't be changed"
 msgstr ""
 
@@ -99,7 +99,7 @@ msgstr ""
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1431
+#: cps/admin.py:442 cps/admin.py:1442
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
@@ -143,7 +143,7 @@ msgstr ""
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1312
+#: cps/admin.py:560 cps/admin.py:1323
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
@@ -203,273 +203,273 @@ msgstr ""
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:860 cps/admin.py:866 cps/admin.py:876 cps/admin.py:886
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:862 cps/admin.py:868 cps/admin.py:878 cps/admin.py:888
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:902
+#: cps/admin.py:913
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1025
+#: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1070
+#: cps/admin.py:1081
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1076
+#: cps/admin.py:1087
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1106
+#: cps/admin.py:1117
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1112
+#: cps/admin.py:1123
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1115
+#: cps/admin.py:1126
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1120
+#: cps/admin.py:1131
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1122
+#: cps/admin.py:1133
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1137
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1128
+#: cps/admin.py:1139
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1135
+#: cps/admin.py:1146
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1148
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1144
+#: cps/admin.py:1155
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1186 cps/admin.py:1297 cps/admin.py:1394 cps/admin.py:1501
-#: cps/admin.py:1570 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
 #: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1197
+#: cps/admin.py:1208
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1212
+#: cps/admin.py:1223
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:1224
+#: cps/admin.py:1235
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1228
+#: cps/admin.py:1239
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1335
+#: cps/admin.py:1346
 msgid "Database Settings updated"
 msgstr ""
 
-#: cps/admin.py:1343
+#: cps/admin.py:1354
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1359 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1478
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:1367
+#: cps/admin.py:1378
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1373 cps/admin.py:1523
+#: cps/admin.py:1384 cps/admin.py:1534
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:1384
+#: cps/admin.py:1395
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:1390
+#: cps/admin.py:1401
 msgid "Found an existing account for this e-mail address or name."
 msgstr ""
 
-#: cps/admin.py:1410
+#: cps/admin.py:1421
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:1412 cps/admin.py:1413
+#: cps/admin.py:1423 cps/admin.py:1424
 msgid "Can't delete Guest User"
 msgstr ""
 
-#: cps/admin.py:1416
+#: cps/admin.py:1427
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1489 cps/admin.py:1614
+#: cps/admin.py:1500 cps/admin.py:1625
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:1493
+#: cps/admin.py:1504
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1497 cps/admin.py:1629 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1532 cps/templates/admin.html:98
+#: cps/admin.py:1543 cps/templates/admin.html:98
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1551
+#: cps/admin.py:1562
 msgid "Gmail Account Verification Successful"
 msgstr ""
 
-#: cps/admin.py:1577
+#: cps/admin.py:1588
 #, python-format
 msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
 msgstr ""
 
-#: cps/admin.py:1580
+#: cps/admin.py:1591
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1582
+#: cps/admin.py:1593
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1584
+#: cps/admin.py:1595
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1626
+#: cps/admin.py:1637
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1632 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1443
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1643
+#: cps/admin.py:1654
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1709
+#: cps/admin.py:1720
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1710
+#: cps/admin.py:1721
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1711
+#: cps/admin.py:1722
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1712
+#: cps/admin.py:1723
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1713
+#: cps/admin.py:1724
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1714
+#: cps/admin.py:1725
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1715
+#: cps/admin.py:1726
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1716 cps/admin.py:1717 cps/admin.py:1718 cps/admin.py:1719
-#: cps/admin.py:1720 cps/admin.py:1721
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1716 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1717 cps/updater.py:387 cps/updater.py:599
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1718 cps/updater.py:389 cps/updater.py:601
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1719 cps/updater.py:391 cps/updater.py:603
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1720
+#: cps/admin.py:1731
 msgid "Update file could not be saved in temp dir"
 msgstr ""
 
-#: cps/admin.py:1721
+#: cps/admin.py:1732
 msgid "Files could not be replaced during update"
 msgstr ""
 
-#: cps/admin.py:1745
+#: cps/admin.py:1756
 msgid "Failed to extract at least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1790
+#: cps/admin.py:1801
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1803
+#: cps/admin.py:1814
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1807
+#: cps/admin.py:1818
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1840
+#: cps/admin.py:1851
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1842
+#: cps/admin.py:1853
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -1328,7 +1328,7 @@ msgstr ""
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:241
+#: cps/tasks/convert.py:245
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -2559,7 +2559,7 @@ msgstr ""
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:76 cps/templates/read.html:71
+#: cps/templates/layout.html:76 cps/templates/read.html:72
 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
 msgid "Settings"
 msgstr ""
@@ -2708,7 +2708,7 @@ msgstr ""
 msgid "epub Reader"
 msgstr ""
 
-#: cps/templates/read.html:74
+#: cps/templates/read.html:75
 msgid "Reflow text when sidebars are open."
 msgstr ""
 

From bdedec90dd8df032cbc666a26618f17bcde3b6ea Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 23 Dec 2021 11:13:08 +0100
Subject: [PATCH 030/220] Catch more Gdrive errors (#2233)

---
 cps/gdrive.py      | 2 +-
 cps/gdriveutils.py | 7 +++++++
 cps/helper.py      | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/cps/gdrive.py b/cps/gdrive.py
index 6ca73ca9..e782cb9e 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -109,7 +109,7 @@ def revoke_watch_gdrive():
         try:
             gdriveutils.stopChannel(gdriveutils.Gdrive.Instance().drive, last_watch_response['id'],
                                     last_watch_response['resourceId'])
-        except HttpError:
+        except (HttpError, AttributeError):
             pass
         config.config_google_drive_watch_changes_response = {}
         config.save()
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 878c1f9f..c4445944 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -56,11 +56,13 @@ try:
     from pydrive2.auth import GoogleAuth
     from pydrive2.drive import GoogleDrive
     from pydrive2.auth import RefreshError
+    from pydrive2.files import ApiRequestError
 except ImportError as err:
     try:
         from pydrive.auth import GoogleAuth
         from pydrive.drive import GoogleDrive
         from pydrive.auth import RefreshError
+        from pydrive.files import ApiRequestError
     except ImportError as err:
         importError = err
         gdrive_support = False
@@ -322,6 +324,11 @@ def getFolderId(path, drive):
         log.error("gdrive.db DB is not Writeable")
         log.debug('Database error: %s', ex)
         session.rollback()
+    except ApiRequestError as ex:
+        log.error('{} {}'.format(ex.error['message'], path))
+        session.rollback()
+    except RefreshError as ex:
+        log.error(ex)
     return currentFolderId
 
 
diff --git a/cps/helper.py b/cps/helper.py
index e4305550..b8499a12 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -673,9 +673,9 @@ def save_cover(img, book_path):
 
 def do_download_file(book, book_format, client, data, headers):
     if config.config_use_google_drive:
-        startTime = time.time()
+        #startTime = time.time()
         df = gd.getFileFromEbooksFolder(book.path, data.name + "." + book_format)
-        log.debug('%s', time.time() - startTime)
+        #log.debug('%s', time.time() - startTime)
         if df:
             return gd.do_gdrive_download(df, headers)
         else:

From ec73558b035e866442732074b717f00b729ae514 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 23 Dec 2021 19:14:21 +0100
Subject: [PATCH 031/220] Bugfix advanced search for language Update results
 from testrun

---
 cps/db.py                               |  17 +-
 test/Calibre-Web TestSummary_Linux.html | 740 ++++++++++--------------
 2 files changed, 313 insertions(+), 444 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 4b0a7ac7..9c5b5657 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -796,23 +796,24 @@ class CalibreDB():
     def speaking_language(self, languages=None, return_all_languages=False, with_count=False, reverse_order=False):
         from . import get_locale
 
-        if not languages:
-            if with_count:
+        if with_count:
+            if not languages:
                 languages = self.session.query(Languages, func.count('books_languages_link.book'))\
                     .join(books_languages_link).join(Books)\
                     .filter(self.common_filters(return_all_languages=return_all_languages)) \
                     .group_by(text('books_languages_link.lang_code')).all()
-                for lang in languages:
-                    lang[0].name = isoLanguages.get_language_name(get_locale(), lang[0].lang_code)
-                return sorted(languages, key=lambda x: x[0].name, reverse=reverse_order)
-            else:
+            for lang in languages:
+                lang[0].name = isoLanguages.get_language_name(get_locale(), lang[0].lang_code)
+            return sorted(languages, key=lambda x: x[0].name, reverse=reverse_order)
+        else:
+            if not languages:
                 languages = self.session.query(Languages) \
                     .join(books_languages_link) \
                     .join(Books) \
                     .filter(self.common_filters(return_all_languages=return_all_languages)) \
                     .group_by(text('books_languages_link.lang_code')).all()
-                for lang in languages:
-                    lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
+            for lang in languages:
+                lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
             return sorted(languages, key=lambda x: x.name, reverse=reverse_order)
 
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 3c54e88b..d291d368 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2021-12-05 19:18:28</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-12-22 20:24:40</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>2021-12-05 22:58:48</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-12-23 00:00:41</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>3h 0 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 57 min</p>
         </div>
       </div>
       </div>
@@ -705,11 +705,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
+        <td class="text-center">13</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
@@ -844,11 +844,31 @@
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id="ft10.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</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.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 300, in test_writeonly_path
+    self.assertTrue(os.path.isdir(book_path))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -881,11 +901,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">34</td>
-        <td class="text-center">0</td>
+        <td class="text-center">32</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -904,11 +924,31 @@
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id="ft11.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</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_ft11.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 177, in test_edit_author
+    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, &#39;O0u Zhi&#39;, &#39;book8 (8)&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1057,11 +1097,31 @@
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id="ft11.19" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</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_ft11.19')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.19').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 74, in test_edit_title
+    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, values[&#39;author&#39;][0], &#39;O0u Zhi (4)&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1405,11 +1465,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">20</td>
-        <td class="text-center">0</td>
+        <td class="text-center">18</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1428,11 +1488,31 @@
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id="ft13.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</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.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 297, in test_edit_author
+    self.assertTrue(gdrive_path)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1554,11 +1634,31 @@
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id="ft13.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</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.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 143, in test_edit_title
+    self.assertTrue(gdrive_path)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1858,11 +1958,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">2</td>
-        <td class="text-center">9</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1872,35 +1972,11 @@
 
     
     
-        <tr id="ft21.1" class="none bg-danger">
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 583, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1914,134 +1990,38 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft21.3" class="none bg-danger">
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 602, in test_kobo_sync_selected_shelfs
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.4" class="none bg-danger">
+        <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 652, in test_kobo_upload_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.5" class="none bg-danger">
+        <tr id='pt21.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 447, in test_shelves_add_remove_books
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.6" class="none bg-danger">
+        <tr id='pt21.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 277, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2055,144 +2035,48 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft21.8" class="none bg-danger">
+        <tr id='pt21.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 514, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.9" class="none bg-danger">
+        <tr id='pt21.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 296, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.10" class="none bg-danger">
+        <tr id='pt21.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 242, in test_sync_unchanged
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft21.11" class="none bg-danger">
+        <tr id='pt21.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 256, in test_sync_upload
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2211,134 +2095,38 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft22.2" class="none bg-danger">
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 260, in test_kobo_sync_selected_shelfs
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.3" class="none bg-danger">
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 164, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.4" class="none bg-danger">
+        <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 237, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.5" class="none bg-danger">
+        <tr id='pt22.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 193, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4377,11 +4165,11 @@ AssertionError: 0 != 1</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestCalibreHelper</td>
         <td class="text-center">16</td>
-        <td class="text-center">16</td>
-        <td class="text-center">0</td>
+        <td class="text-center">11</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -4454,29 +4242,95 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id="ft41.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</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_ft41.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 44, in test_check_chinese_Characters
+    self.assertEqual(helper.get_valid_filename(u&#39;执一&#39;), u&#39;Zhi Yi&#39;)
+AssertionError: &#39;执一&#39; != &#39;Zhi Yi&#39;
+- 执一
++ Zhi Yi</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id="ft41.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</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_ft41.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 71, in test_check_deg_eur_replacement
+    self.assertEqual(helper.get_valid_filename(u&#39;°€&#39;), u&#39;degEUR&#39;)
+AssertionError: &#39;°€&#39; != &#39;degEUR&#39;
+- °€
++ degEUR</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id="ft41.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</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_ft41.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 36, in test_check_doubleS
+    self.assertEqual(helper.get_valid_filename(u&#39;§ß&#39;), u&#39;SSss&#39;)
+AssertionError: &#39;§ß&#39; != &#39;SSss&#39;
+- §ß
++ SSss</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4490,20 +4344,64 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id="ft41.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</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_ft41.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 32, in test_check_high23
+    self.assertEqual(helper.get_valid_filename(u&#39;²³&#39;), u&#39;23&#39;)
+AssertionError: &#39;²³&#39; != &#39;23&#39;
+- ²³
++ 23</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id="ft41.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</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_ft41.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 40, in test_check_umlauts
+    self.assertEqual(helper.get_valid_filename(u&#39;ÄÜÖäöü&#39;), u&#39;AUOaou&#39;)
+AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
+- ÄÜÖäöü
++ AUOaou</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4538,8 +4436,8 @@ AssertionError: 0 != 1</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>378</td>
-        <td>358</td>
-        <td>14</td>
+        <td>361</td>
+        <td>11</td>
         <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
@@ -4581,7 +4479,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Babel</th>
-              <td>2.9.0</td>
+              <td>2.9.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4593,13 +4491,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Flask</th>
-              <td>1.1.2</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Flask-Babel</th>
-              <td>1.0.0</td>
+              <td>2.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -4627,12 +4525,6 @@ AssertionError: 0 != 1</pre>
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>httplib2</th>
-              <td>0.14.0</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>iso-639</th>
               <td>0.4.5</td>
@@ -4641,25 +4533,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>2.11.2</td>
+              <td>3.0.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>lxml</th>
-              <td>4.6.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>natsort</th>
-              <td>7.1.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>pyasn1</th>
-              <td>0.4.8</td>
+              <td>4.6.5</td>
               <td>Basic</td>
             </tr>
           
@@ -4671,31 +4551,19 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>pytz</th>
-              <td>2019.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>2021.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>requests</th>
-              <td>2.22.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>six</th>
-              <td>1.14.0</td>
+              <td>2.24.0</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.27</td>
+              <td>1.4.28</td>
               <td>Basic</td>
             </tr>
           
@@ -4707,7 +4575,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.1.1</td>
+              <td>1.2.0</td>
               <td>Basic</td>
             </tr>
           
@@ -4719,13 +4587,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>Werkzeug</th>
-              <td>1.0.1</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4749,13 +4617,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4779,13 +4647,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4809,7 +4677,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4827,7 +4695,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4851,13 +4719,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.33.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4881,7 +4749,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4899,13 +4767,13 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.3.2</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.3.2</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -4917,7 +4785,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.3.2</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4935,7 +4803,7 @@ AssertionError: 0 != 1</pre>
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.37.9</td>
+              <td>0.38.1</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -4947,7 +4815,7 @@ AssertionError: 0 != 1</pre>
 </div>
 
 <script>
-    drawCircle(358, 14, 0, 6);
+    drawCircle(361, 11, 0, 6);
     showCase(5);
 </script>
 

From 222929e7413f97c4b81b093d1f21a8586d5c605d Mon Sep 17 00:00:00 2001
From: cbartondock <cbartondock@gmail.com>
Date: Thu, 23 Dec 2021 18:05:20 -0500
Subject: [PATCH 032/220] Fixed extra s in scholar metadata

---
 cps/metadata_provider/scholar.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 6e13c768..9aa0ab87 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -19,20 +19,23 @@
 from scholarly import scholarly
 
 from cps.services.Metadata import Metadata
-
+import pprint
+pp = pprint.PrettyPrinter(indent=4)
 
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
 
-    def search(self, query, generic_cover=""):
+    def search(self, query, generic_cover=None):
         val = list()
         if self.active:
             scholar_gen = scholarly.search_pubs(' '.join(query.split('+')))
             i = 0
             for publication in scholar_gen:
+                print(f"PUBLICATION {i + 1}")
+                pp.pprint(publication)
                 v = dict()
-                v['id'] = "1234" # publication['bib'].get('title')
+                v['id'] = publication['url_scholarbib'].split(':')[1]
                 v['title'] = publication['bib'].get('title')
                 v['authors'] = publication['bib'].get('author', [])
                 v['description'] = publication['bib'].get('abstract', "")
@@ -41,8 +44,8 @@ class scholar(Metadata):
                     v['publishedDate'] = publication['bib'].get('pub_year')+"-01-01"
                 else:
                     v['publishedDate'] = ""
-                v['tags'] = ""
-                v['ratings'] = 0
+                v['tags'] = []
+                v['rating'] = 0
                 v['series'] = ""
                 v['cover'] = generic_cover
                 v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "",
@@ -55,6 +58,7 @@ class scholar(Metadata):
                 i += 1
                 if (i >= 10):
                     break
+        pp.pprint(val)
         return val
 
 

From 4edd1914b4d2b90a826b199167ca55e34258b7c4 Mon Sep 17 00:00:00 2001
From: cbartondock <cbartondock@gmail.com>
Date: Thu, 23 Dec 2021 23:16:41 -0500
Subject: [PATCH 033/220] Fixed google scholar issues

---
 cps/metadata_provider/scholar.py | 7 +------
 cps/search_metadata.py           | 4 ++--
 cps/static/js/get_meta.js        | 4 +---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 9aa0ab87..5ff078b9 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -19,21 +19,17 @@
 from scholarly import scholarly
 
 from cps.services.Metadata import Metadata
-import pprint
-pp = pprint.PrettyPrinter(indent=4)
 
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
 
-    def search(self, query, generic_cover=None):
+    def search(self, query, generic_cover=""):
         val = list()
         if self.active:
             scholar_gen = scholarly.search_pubs(' '.join(query.split('+')))
             i = 0
             for publication in scholar_gen:
-                print(f"PUBLICATION {i + 1}")
-                pp.pprint(publication)
                 v = dict()
                 v['id'] = publication['url_scholarbib'].split(':')[1]
                 v['title'] = publication['bib'].get('title')
@@ -58,7 +54,6 @@ class scholar(Metadata):
                 i += 1
                 if (i >= 10):
                     break
-        pp.pprint(val)
         return val
 
 
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index e837fe21..b88f222f 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -103,9 +103,9 @@ def metadata_search():
     data = list()
     active = current_user.view_settings.get('metadata', {})
     if query:
-        static_cover = url_for('static', filename='generic_cover.jpg')
+        generic_cover = ""
         with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-            meta = {executor.submit(c.search, query, static_cover): c for c in cl if active.get(c.__id__, True)}
+            meta = {executor.submit(c.search, query, generic_cover): c for c in cl if active.get(c.__id__, True)}
             for future in concurrent.futures.as_completed(meta):
                 data.extend(future.result())
     return Response(json.dumps(data), mimetype='application/json')
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 51ab740d..2ad4d53b 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -40,7 +40,7 @@ $(function () {
         $("#book_title").val(book.title);
         $("#tags").val(uniqueTags.join(", "));
         $("#rating").data("rating").setValue(Math.round(book.rating));
-        if(book.cover !== null){
+        if(book.cover){
             $(".cover img").attr("src", book.cover);
             $("#cover_url").val(book.cover);
         }
@@ -128,9 +128,7 @@ $(function () {
         e.preventDefault();
         keyword = $("#keyword").val();
         $('.pill').each(function(){
-            // console.log($(this).data('control'));
             $(this).data("initial", $(this).prop('checked'));
-            // console.log($(this).data('initial'));
         });
         doSearch(keyword);
     });

From 7eb875f388a8e7b708dff3373eb92fde5106b2c4 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 28 Dec 2021 17:13:18 +0100
Subject: [PATCH 034/220] Improvement for gdrive rename authors

---
 cps/helper.py | 54 ++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 13 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 21dab9a3..33a87cae 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -360,6 +360,31 @@ def clean_author_database(renamed_author, calibrepath, local_book=None):
                     file_format.name = all_new_name
 
 
+def clean_author_database_gdrive(renamed_author, calibrepath, local_book=None):
+    valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
+    for r in renamed_author:
+        if local_book:
+            all_books = [local_book]
+        else:
+            all_books = calibre_db.session.query(db.Books) \
+                .filter(db.Books.authors.any(db.Authors.name == r)).all()
+        for book in all_books:
+            book_author_path = book.path.split('/')[0]
+            if book_author_path in valid_filename_authors or local_book:
+                new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
+                all_new_authordir = get_valid_filename(new_author.name)
+                all_titledir = book.path.split('/')[1]
+                all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
+                all_new_name = get_valid_filename(book.title) + ' - ' + all_new_authordir
+                # change location in database to new author/title path
+                book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
+                for file_format in book.data:
+                    shutil.move(os.path.normcase(
+                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
+                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
+                    file_format.name = all_new_name
+
+
 # was muss gemacht werden:
 # Die Autorennamen müssen separiert werden und von dupletten bereinigt werden.
 # Es muss geprüft werden:
@@ -465,6 +490,9 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r)
             new_author_rename_dir = get_valid_filename(new_author.name)
+            gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
+            if gFile:
+                gd.moveGdriveFileRemote(gFile, new_author_rename_dir)
             '''if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
                 try:
                     old_author_path = os.path.join(calibrepath, old_author_dir)
@@ -501,19 +529,6 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
             error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
-    # Todo: Rename all authors on gdrive
-    # Rename all files from old names to new names
-    '''
-    try:
-        clean_author_database(renamed_author, calibrepath)
-        if first_author not in renamed_author:
-            clean_author_database([first_author], calibrepath, localbook)
-        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-            shutil.rmtree(os.path.dirname(path))
-    except (OSError, FileNotFoundError) as ex:
-        log.error("Error in rename file in path %s", ex)
-        log.debug(ex, exc_info=True)
-        return _("Error in rename file in path: %(error)s", error=str(ex))'''
     if authordir != new_authordir or titledir != new_titledir:
         new_name = get_valid_filename(book.title) + u' - ' + get_valid_filename(new_authordir)
         for file_format in book.data:
@@ -523,6 +538,19 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
                 break
             gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
             file_format.name = new_name
+    # Todo: Rename all authors on gdrive
+    # Rename all files from old names to new names
+    try:
+        # calibrepath -> config.config_calibre_dir
+        clean_author_database_gdrive(renamed_author, calibrepath)
+        if first_author not in renamed_author:
+            clean_author_database_gdrive([first_author], calibrepath, localbook)
+        if not renamed_author and len(os.listdir(os.path.dirname(path))) == 0:
+            shutil.rmtree(os.path.dirname(path))
+    except (OSError, FileNotFoundError) as ex:
+        log.error("Error in rename file in path %s", ex)
+        log.debug(ex, exc_info=True)
+        return _("Error in rename file in path: %(error)s", error=str(ex))
     return error
 
 

From 785726deee13b4d56f6c3503dd57c1e3eb7d6f30 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Dec 2021 10:09:11 +0100
Subject: [PATCH 035/220] Migrated some routes to POST - delete shelf, import
 ldap users - delete_kobo token, kobo force full sync - shutdown, reconnect,
 shutdown

---
 cps/admin.py             | 10 +++++-----
 cps/editbooks.py         | 17 ++++++-----------
 cps/kobo_auth.py         |  8 ++------
 cps/shelf.py             |  9 +++++----
 cps/static/js/main.js    | 29 ++++++++++++++++++-----------
 cps/templates/shelf.html | 22 ++++------------------
 cps/web.py               |  5 +++--
 7 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 1c228e49..29f5fb20 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -129,11 +129,11 @@ def admin_forbidden():
     abort(403)
 
 
-@admi.route("/shutdown")
+@admi.route("/shutdown", methods=["POST"])
 @login_required
 @admin_required
 def shutdown():
-    task = int(request.args.get("parameter").strip())
+    task = request.get_json().get('parameter', -1)
     showtext = {}
     if task in (0, 1):  # valid commandos received
         # close all database connections
@@ -906,7 +906,7 @@ def list_restriction(res_type, user_id):
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
-@admi.route("/ajax/fullsync")
+@admi.route("/ajax/fullsync", methods=["POST"])
 @login_required
 def ajax_fullsync():
     count = ub.session.query(ub.KoboSyncedBooks).filter(current_user.id == ub.KoboSyncedBooks.user_id).delete()
@@ -1626,7 +1626,7 @@ def edit_user(user_id):
                                  page="edituser")
 
 
-@admi.route("/admin/resetpassword/<int:user_id>")
+@admi.route("/admin/resetpassword/<int:user_id>", methods=["POST"])
 @login_required
 @admin_required
 def reset_user_password(user_id):
@@ -1802,7 +1802,7 @@ def ldap_import_create_user(user, user_data):
         return 0, message
 
 
-@admi.route('/import_ldap_users')
+@admi.route('/import_ldap_users', methods=["POST"])
 @login_required
 @admin_required
 def import_ldap_users():
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 21dc3ba0..b6fdc164 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -26,6 +26,8 @@ import json
 from shutil import copyfile
 from uuid import uuid4
 from markupsafe import escape
+from functools import wraps
+
 try:
     from lxml.html.clean import clean_html
 except ImportError:
@@ -51,13 +53,6 @@ from .tasks.upload import TaskUpload
 from .render_template import render_title_template
 from .usermanagement import login_required_if_no_ano
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
-
-
-
 
 editbook = Blueprint('editbook', __name__)
 log = logger.create()
@@ -237,14 +232,14 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
             changed = True
     return changed, error
 
-@editbook.route("/ajax/delete/<int:book_id>")
+@editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
     return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
 
 
-@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""})
-@editbook.route("/delete/<int:book_id>/<string:book_format>")
+@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
+@editbook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
 @login_required
 def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
@@ -1014,7 +1009,7 @@ def move_coverfile(meta, db_book):
               category="error")
 
 
-@editbook.route("/upload", methods=["GET", "POST"])
+@editbook.route("/upload", methods=["POST"])
 @login_required_if_no_ano
 @upload_required
 def upload():
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index a51095c8..8d46b26a 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -62,6 +62,7 @@ particular calls to non-Kobo specific endpoints such as the CalibreWeb book down
 from binascii import hexlify
 from datetime import datetime
 from os import urandom
+from functools import wraps
 
 from flask import g, Blueprint, url_for, abort, request
 from flask_login import login_user, current_user, login_required
@@ -70,11 +71,6 @@ from flask_babel import gettext as _
 from . import logger, config, calibre_db, db, helper, ub, lm
 from .render_template import render_title_template
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
-
 
 log = logger.create()
 
@@ -167,7 +163,7 @@ def generate_auth_token(user_id):
         )
 
 
-@kobo_auth.route("/deleteauthtoken/<int:user_id>")
+@kobo_auth.route("/deleteauthtoken/<int:user_id>", methods=["POST"])
 @login_required
 def delete_auth_token(user_id):
     # Invalidate any prevously generated Kobo Auth token for this user.
diff --git a/cps/shelf.py b/cps/shelf.py
index 5f6a66bf..19c2d68e 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -56,7 +56,7 @@ def check_shelf_view_permissions(cur_shelf):
     return True
 
 
-@shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>")
+@shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>", methods=["POST"])
 @login_required
 def add_to_shelf(shelf_id, book_id):
     xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
@@ -112,7 +112,7 @@ def add_to_shelf(shelf_id, book_id):
     return "", 204
 
 
-@shelf.route("/shelf/massadd/<int:shelf_id>")
+@shelf.route("/shelf/massadd/<int:shelf_id>", methods=["POST"])
 @login_required
 def search_to_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
@@ -164,7 +164,7 @@ def search_to_shelf(shelf_id):
     return redirect(url_for('web.index'))
 
 
-@shelf.route("/shelf/remove/<int:shelf_id>/<int:book_id>")
+@shelf.route("/shelf/remove/<int:shelf_id>/<int:book_id>", methods=["POST"])
 @login_required
 def remove_from_shelf(shelf_id, book_id):
     xhr = request.headers.get('X-Requested-With') == 'XMLHttpRequest'
@@ -323,12 +323,13 @@ def delete_shelf_helper(cur_shelf):
     ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
 
 
-@shelf.route("/shelf/delete/<int:shelf_id>")
+@shelf.route("/shelf/delete/<int:shelf_id>", methods=["POST"])
 @login_required
 def delete_shelf(shelf_id):
     cur_shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     try:
         delete_shelf_helper(cur_shelf)
+        flash(_("Shelf successfully deleted"), category="success")
     except InvalidRequestError:
         ub.session.rollback()
         log.error("Settings DB is not Writeable")
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 585d2296..6cef22f8 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -179,7 +179,7 @@ $("#delete_confirm").click(function() {
         if (ajaxResponse) {
             path = getPath() + "/ajax/delete/" + deleteId;
             $.ajax({
-                method:"get",
+                method:"post",
                 url: path,
                 timeout: 900,
                 success:function(data) {
@@ -376,9 +376,11 @@ $(function() {
 
     $("#restart").click(function() {
         $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../../shutdown",
-            data: {"parameter":0},
+            url: getPath() + "/shutdown",
+            data: JSON.stringify({"parameter":0}),
             success: function success() {
                 $("#spinner").show();
                 setTimeout(restartTimer, 3000);
@@ -387,9 +389,11 @@ $(function() {
     });
     $("#shutdown").click(function() {
         $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
-            url: window.location.pathname + "/../../shutdown",
-            data: {"parameter":1},
+            url: getPath() + "/shutdown",
+            data: JSON.stringify({"parameter":1}),
             success: function success(data) {
                 return alert(data.text);
             }
@@ -447,9 +451,11 @@ $(function() {
         $("#DialogContent").html("");
         $("#spinner2").show();
         $.ajax({
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
             url: getPath() + "/shutdown",
-            data: {"parameter":2},
+            data: JSON.stringify({"parameter":2}),
             success: function success(data) {
                 $("#spinner2").hide();
                 $("#DialogContent").html(data.text);
@@ -527,7 +533,7 @@ $(function() {
             $(this).data('value'),
             function (value) {
                 $.ajax({
-                    method: "get",
+                    method: "post",
                     url: getPath() + "/kobo_auth/deleteauthtoken/" + value,
                 });
                 $("#config_delete_kobo_token").hide();
@@ -574,7 +580,7 @@ $(function() {
             function(value){
                 path = getPath() + "/ajax/fullsync"
                 $.ajax({
-                    method:"get",
+                    method:"post",
                     url: path,
                     timeout: 900,
                     success:function(data) {
@@ -638,7 +644,7 @@ $(function() {
                     else {
                         $("#InvalidDialog").modal('show');
                     }
-                } else {                	
+                } else {
                     changeDbSettings();
                 }
             }
@@ -685,7 +691,7 @@ $(function() {
             "GeneralDeleteModal",
             $(this).data('value'),
             function(value){
-                window.location.href = window.location.pathname + "/../../shelf/delete/" + value
+                $("#delete_shelf").closest("form").submit()
             }
         );
 
@@ -734,7 +740,8 @@ $(function() {
         $("#DialogContent").html("");
         $("#spinner2").show();
         $.ajax({
-            method:"get",
+            method:"post",
+            contentType: "application/json; charset=utf-8",
             dataType: "json",
             url: getPath() + "/import_ldap_users",
             success: function success(data) {
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 4f74a4da..5bb9317e 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -2,14 +2,16 @@
 {% block body %}
 <div class="discover">
   <h2>{{title}}</h2>
+      <form action="{{url_for('shelf.delete_shelf', shelf_id=shelf.id)}}" method="post">
   {% if g.user.role_download() %}
   <a id="shelf_down" href="{{ url_for('shelf.show_simpleshelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Download') }} </a>
       {% endif %}
   {% if g.user.is_authenticated %}
     {% if (g.user.role_edit_shelfs() and shelf.is_public ) or not shelf.is_public  %}
-      <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-      <div class="btn btn-danger" id="delete_shelf" data-value="{{ shelf.id }}">{{ _('Delete this Shelf') }}</div>
+        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+        <div class="btn btn-danger" id="delete_shelf" data-value="{{ shelf.id }}">{{ _('Delete this Shelf') }}</div>
       <a id="edit_shelf" href="{{ url_for('shelf.edit_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Edit Shelf Properties') }} </a>
+      </form>
       {% if entries.__len__() %}
       <a id="order_shelf" href="{{ url_for('shelf.order_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Arrange books manually') }} </a>
       <button id="toggle_order_shelf" type="button" data-alt-text="{{ _('Disable Change order') }}" class="btn btn-primary">{{ _('Enable Change order') }}</button>
@@ -84,22 +86,6 @@
     {% endfor %}
   </div>
 </div>
-<!--div id="DeleteShelfDialog" class="modal fade" role="dialog">
-  <div class="modal-dialog modal-sm">
-    <div class="modal-content">
-      <div class="modal-header bg-danger text-center">
-      <span>{{_('Are you sure you want to delete this shelf?')}}</span>
-      </div>
-      <div class="modal-body text-center">
-        <span>{{_('Shelf will be deleted for all users')}}</span>
-          <p></p>
-        <a id="confirm" href="{{ url_for('shelf.delete_shelf', shelf_id=shelf.id) }}" class="btn btn-danger">{{_('OK')}}</a>
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
-      </div>
-    </div>
-  </div>
-</div-->
-
 {% endblock %}
 {% block modal %}
 {{ delete_confirm_modal() }}
diff --git a/cps/web.py b/cps/web.py
index f203783b..81c37711 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1055,7 +1055,8 @@ def get_tasks_status():
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
 
-@app.route("/reconnect")
+# method is available without login and not protected by CSRF to make it easy reachable
+@app.route("/reconnect", methods=['GET'])
 def reconnect():
     calibre_db.reconnect_db(config, ub.app_DB_path)
     return json.dumps({})
@@ -1435,7 +1436,7 @@ def download_link(book_id, book_format, anyname):
     return get_download_link(book_id, book_format, client)
 
 
-@web.route('/send/<int:book_id>/<book_format>/<int:convert>')
+@web.route('/send/<int:book_id>/<book_format>/<int:convert>', methods=["POST"])
 @login_required
 @download_required
 def send_to_kindle(book_id, book_format, convert):

From 573c9f9fb495f4408d31c8a272702a099fb463d4 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Dec 2021 10:35:08 +0100
Subject: [PATCH 036/220] Improved logging (right stacklevel on mail
 exceptions) Updated jsonschema requirements

---
 cps/logger.py             | 13 ++++---------
 cps/tasks/mail.py         | 12 ++++++------
 optional-requirements.txt |  2 +-
 setup.cfg                 |  2 +-
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/cps/logger.py b/cps/logger.py
index 5847188b..053d0bd3 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -42,20 +42,15 @@ logging.addLevelName(logging.CRITICAL, "CRIT")
 
 class _Logger(logging.Logger):
 
-    def debug_or_exception(self, message, *args, **kwargs):
+    def debug_or_exception(self, message, stacklevel=2, *args, **kwargs):
         if sys.version_info > (3, 7):
             if is_debug_enabled():
-                self.exception(message, stacklevel=2, *args, **kwargs)
+                self.exception(message, stacklevel=stacklevel, *args, **kwargs)
             else:
-                self.error(message, stacklevel=2, *args, **kwargs)
-        elif sys.version_info > (3, 0):
-            if is_debug_enabled():
-                self.exception(message, stack_info=True, *args, **kwargs)
-            else:
-                self.error(message, *args, **kwargs)
+                self.error(message, stacklevel=stacklevel, *args, **kwargs)
         else:
             if is_debug_enabled():
-                self.exception(message, *args, **kwargs)
+                self.exception(message, stack_info=True, *args, **kwargs)
             else:
                 self.error(message, *args, **kwargs)
 
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 05b2175f..03526c8b 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -158,10 +158,10 @@ class TaskEmail(CalibreTask):
             else:
                 self.send_gmail_email(msg)
         except MemoryError as e:
-            log.debug_or_exception(e)
+            log.debug_or_exception(e, stacklevel=3)
             self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
-            log.debug_or_exception(e)
+            log.debug_or_exception(e, stacklevel=3)
             if hasattr(e, "smtp_error"):
                 text = e.smtp_error.decode('utf-8').replace("\n", '. ')
             elif hasattr(e, "message"):
@@ -171,11 +171,11 @@ class TaskEmail(CalibreTask):
             else:
                 text = ''
             self._handleError(u'Smtplib Error sending e-mail: {}'.format(text))
-        except socket.error as e:
-            log.debug_or_exception(e)
+        except (socket.error) as e:
+            log.debug_or_exception(e, stacklevel=3)
             self._handleError(u'Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.debug_or_exception(ex, stacklevel=3)
             self._handleError(u'Error sending e-mail: {}'.format(ex))
 
     def send_standard_email(self, msg):
@@ -248,7 +248,7 @@ class TaskEmail(CalibreTask):
                 data = file_.read()
                 file_.close()
             except IOError as e:
-                log.debug_or_exception(e)
+                log.debug_or_exception(e, stacklevel=3)
                 log.error(u'The requested file could not be read. Maybe wrong permissions?')
                 return None
         # Set mimetype
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 3fac14ca..c0009c94 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -38,4 +38,4 @@ natsort>=2.2.0,<8.1.0
 comicapi>=2.2.0,<2.3.0
 
 #Kobo integration
-jsonschema>=3.2.0,<4.3.0
+jsonschema>=3.2.0,<4.4.0
diff --git a/setup.cfg b/setup.cfg
index 87f6055f..95f3502d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -87,7 +87,7 @@ comics =
     natsort>=2.2.0,<8.1.0
     comicapi>= 2.2.0,<2.3.0
 kobo =
-    jsonschema>=3.2.0,<4.3.0
+    jsonschema>=3.2.0,<4.4.0
 
 
 

From f39dc100b458e86d195a007619da7292af7033e1 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 25 Dec 2021 21:39:58 +0100
Subject: [PATCH 037/220] Migrated some routes to POST - shelf massadd -
 resetpassword - delete shelf - send to kindle

---
 cps/static/js/details.js     |  2 +-
 cps/static/js/main.js        | 36 +++++++++++++++++++++++++++++++++---
 cps/templates/detail.html    |  6 +++---
 cps/templates/search.html    |  2 +-
 cps/templates/shelf.html     |  4 ++--
 cps/templates/user_edit.html |  2 +-
 6 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index 9caf9470..3a7def32 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -62,7 +62,7 @@ $("#archived_cb").on("change", function() {
     $("#shelf-actions").on("click", "[data-shelf-action]", function (e) {
         e.preventDefault();
 
-        $.get(this.href)
+        $.post(this.href)
             .done(function() {
                 var $this = $(this);
                 switch ($this.data("shelf-action")) {
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 6cef22f8..e8da76ef 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -20,6 +20,20 @@ function getPath() {
     return jsFileLocation.substr(0, jsFileLocation.search("/static/js/libs/jquery.min.js"));  // the js folder path
 }
 
+function postButton(event, action){
+    event.preventDefault();
+    var newForm = jQuery('<form>', {
+        "action": action,
+        'target': "_top",
+        'method': "post"
+    }).append(jQuery('<input>', {
+        'name': 'csrf_token',
+        'value': $("input[name=\'csrf_token\']").val(),
+        'type': 'hidden'
+    })).appendTo('body');
+    newForm.submit();
+}
+
 function elementSorter(a, b) {
     a = +a.slice(0, -2);
     b = +b.slice(0, -2);
@@ -71,6 +85,22 @@ $(document).on("change", "select[data-controlall]", function() {
     }
 });
 
+/*$(document).on("click", "#sendbtn", function (event) {
+    postButton(event, $(this).data('action'));
+});
+
+$(document).on("click", ".sendbutton", function (event) {
+    // $(".sendbutton").on("click", "body", function(event) {
+    postButton(event, $(this).data('action'));
+});*/
+
+$(document).on("click", ".postAction", function (event) {
+    // $(".sendbutton").on("click", "body", function(event) {
+    postButton(event, $(this).data('action'));
+});
+
+
+
 // Syntax has to be bind not on, otherwise problems with firefox
 $(".container-fluid").bind("dragenter dragover", function () {
     if($("#btn-upload").length && !$('body').hasClass('shelforder')) {
@@ -685,13 +715,14 @@ $(function() {
         });
     });
 
-    $("#delete_shelf").click(function() {
+    $("#delete_shelf").click(function(event) {
         confirmDialog(
             $(this).attr('id'),
             "GeneralDeleteModal",
             $(this).data('value'),
             function(value){
-                $("#delete_shelf").closest("form").submit()
+                postButton(event, $("#delete_shelf").data("action"));
+                // $("#delete_shelf").closest("form").submit()
             }
         );
 
@@ -775,4 +806,3 @@ $(function() {
         });
     });
 });
-
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 0ecaf903..1fd5f09a 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -38,16 +38,16 @@
           {% endif %}
             {% if g.user.kindle_mail and kindle_list %}
               {% if kindle_list.__len__() == 1 %}
-                <a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" id="sendbtn" data-text="{{_('Send to Kindle')}}" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</a>
+                <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
-                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle postAction" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="glyphicon glyphicon-send"></span>{{_('Send to Kindle')}}
                     <span class="caret"></span>
                   </button>
                     <ul class="dropdown-menu" aria-labelledby="send-to-kindle">
                     {% for format in kindle_list %}
-                      <li><a href="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
+                      <li><a class="postAction" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=format['format'], convert=format['convert'])}}">{{format['text']}}</a></li>
                     {%endfor%}
                     </ul>
                 </div>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 627beaf8..32339803 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -17,7 +17,7 @@
               <ul id="add-to-shelves" class="dropdown-menu" aria-labelledby="add-to-shelf">
                 {% for shelf in g.shelves_access %}
                   {% if not shelf.is_public or g.user.role_edit_shelfs() %}
-                    <li><a href="{{ url_for('shelf.search_to_shelf', shelf_id=shelf.id) }}"> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
+                    <li><a class="postAction" role="button" data-action="{{ url_for('shelf.search_to_shelf', shelf_id=shelf.id) }}"> {{shelf.name}}{% if shelf.is_public == 1 %} {{_('(Public)')}}{% endif %}</a></li>
                   {% endif %}
                 {%endfor%}
               </ul>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 5bb9317e..adfead60 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -2,14 +2,14 @@
 {% block body %}
 <div class="discover">
   <h2>{{title}}</h2>
-      <form action="{{url_for('shelf.delete_shelf', shelf_id=shelf.id)}}" method="post">
+      <!--form  method="post"--->
   {% if g.user.role_download() %}
   <a id="shelf_down" href="{{ url_for('shelf.show_simpleshelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Download') }} </a>
       {% endif %}
   {% if g.user.is_authenticated %}
     {% if (g.user.role_edit_shelfs() and shelf.is_public ) or not shelf.is_public  %}
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-        <div class="btn btn-danger" id="delete_shelf" data-value="{{ shelf.id }}">{{ _('Delete this Shelf') }}</div>
+        <div class="btn btn-danger" data-action="{{url_for('shelf.delete_shelf', shelf_id=shelf.id)}}" id="delete_shelf" data-value="{{ shelf.id }}">{{ _('Delete this Shelf') }}</div>
       <a id="edit_shelf" href="{{ url_for('shelf.edit_shelf', shelf_id=shelf.id) }}" class="btn btn-primary">{{ _('Edit Shelf Properties') }} </a>
       </form>
       {% if entries.__len__() %}
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index e6fbdb74..de7a4fb3 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -17,7 +17,7 @@
     </div>
     {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
       {% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None ) %}
-        <a class="btn btn-default" id="resend_password" href="{{url_for('admin.reset_user_password', user_id = content.id) }}">{{_('Reset user Password')}}</a>
+        <a class="btn btn-default postAction" id="resend_password" role="button" data-action="{{url_for('admin.reset_user_password', user_id = content.id) }}">{{_('Reset user Password')}}</a>
       {% endif %}
         <div class="form-group">
           <label for="password">{{_('Password')}}</label>

From 47f5e2ffb4253b57271e76444e465da425752239 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 26 Dec 2021 10:31:04 +0100
Subject: [PATCH 038/220] Remove python2 urllib imports Fix for "javascript:"
 script links in identifier

---
 cps/db.py                 | 3 +++
 cps/helper.py             | 5 +----
 cps/kobo.py               | 6 +-----
 cps/redirect.py           | 6 ++----
 cps/services/SyncToken.py | 7 ++-----
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 9c5b5657..470ecc1c 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -23,6 +23,7 @@ import re
 import ast
 import json
 from datetime import datetime
+from urllib.parse import quote
 
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey, CheckConstraint
@@ -166,6 +167,8 @@ class Identifiers(Base):
             return u"https://portal.issn.org/resource/ISSN/{0}".format(self.val)
         elif format_type == "isfdb":
             return u"http://www.isfdb.org/cgi-bin/pl.cgi?{0}".format(self.val)
+        elif self.val.lower().startswith("javascript:"):
+            return quote(self.val)
         else:
             return u"{0}".format(self.val)
 
diff --git a/cps/helper.py b/cps/helper.py
index b8499a12..e8a0b738 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -38,11 +38,8 @@ from sqlalchemy.sql.expression import true, false, and_, text, func
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from markupsafe import escape
+from urllib.parse import quote
 
-try:
-    from urllib.parse import quote
-except ImportError:
-    from urllib import quote
 
 try:
     import unidecode
diff --git a/cps/kobo.py b/cps/kobo.py
index e0395855..b5ff000e 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -23,11 +23,7 @@ import os
 import uuid
 from time import gmtime, strftime
 import json
-
-try:
-    from urllib import unquote
-except ImportError:
-    from urllib.parse import unquote
+from urllib.parse import unquote
 
 from flask import (
     Blueprint,
diff --git a/cps/redirect.py b/cps/redirect.py
index d491b353..8bd68109 100644
--- a/cps/redirect.py
+++ b/cps/redirect.py
@@ -27,10 +27,8 @@
 
 # http://flask.pocoo.org/snippets/62/
 
-try:
-    from urllib.parse import urlparse, urljoin
-except ImportError:
-    from urlparse import urlparse, urljoin
+from urllib.parse import urlparse, urljoin
+
 
 from flask import request, url_for, redirect
 
diff --git a/cps/services/SyncToken.py b/cps/services/SyncToken.py
index 85ed5032..2e23efe2 100644
--- a/cps/services/SyncToken.py
+++ b/cps/services/SyncToken.py
@@ -21,11 +21,8 @@ import sys
 from base64 import b64decode, b64encode
 from jsonschema import validate, exceptions, __version__
 from datetime import datetime
-try:
-    # pylint: disable=unused-import
-    from urllib import unquote
-except ImportError:
-    from urllib.parse import unquote
+
+from urllib.parse import unquote
 
 from flask import json
 from .. import logger

From 3e0d8763c377d2146462811e3e4ccf13f0d312ce Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 26 Dec 2021 10:46:43 +0100
Subject: [PATCH 039/220] Prevent 2 public shelfs with same names due to
 changing public property

---
 cps/shelf.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cps/shelf.py b/cps/shelf.py
index 19c2d68e..b1fbdd04 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -248,12 +248,13 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
         if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
             flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
             return redirect(url_for('web.index'))
-        shelf.is_public = 1 if to_save.get("is_public") else 0
+        is_public = 1 if to_save.get("is_public") else 0
         if config.config_kobo_sync:
             shelf.kobo_sync = True if to_save.get("kobo_sync") else False
         shelf_title = to_save.get("title", "")
-        if check_shelf_is_unique(shelf, shelf_title, shelf_id):
+        if check_shelf_is_unique(shelf, shelf_title, is_public, shelf_id):
             shelf.name = shelf_title
+            shelf.is_public = is_public
             if not shelf_id:
                 shelf.user_id = int(current_user.id)
                 ub.session.add(shelf)
@@ -284,12 +285,12 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
                                  sync_only_selected_shelves=sync_only_selected_shelves)
 
 
-def check_shelf_is_unique(shelf, title, shelf_id=False):
+def check_shelf_is_unique(shelf, title, is_public, shelf_id=False):
     if shelf_id:
         ident = ub.Shelf.id != shelf_id
     else:
         ident = true()
-    if shelf.is_public == 1:
+    if is_public == 1:
         is_shelf_name_unique = ub.session.query(ub.Shelf) \
                                    .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
                                    .filter(ident) \

From f22e4d996c0f647b506cd42c60407a9ee8c78818 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 27 Dec 2021 09:31:32 +0100
Subject: [PATCH 040/220] Proxy kobo library sync at the end of local sync

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

diff --git a/cps/kobo.py b/cps/kobo.py
index b5ff000e..c74a3230 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -321,7 +321,7 @@ def HandleSyncRequest():
 
 def generate_sync_response(sync_token, sync_results, set_cont=False):
     extra_headers = {}
-    if config.config_kobo_proxy:
+    if config.config_kobo_proxy and not set_cont:
         # Merge in sync results from the official Kobo store.
         try:
             store_response = make_request_to_kobo_store(sync_token)

From 0548fbb685569851ec5a37b3650c5b6c54ee4447 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 27 Dec 2021 09:37:52 +0100
Subject: [PATCH 041/220] Bugfix post commands without updater

---
 cps/templates/admin.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 9728cb6d..6cd7815e 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -188,9 +188,8 @@
           </tr>
         </tbody>
       </table>
-
-      {%  if feature_support['updater'] %}
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+      {%  if feature_support['updater'] %}
       <div class="hidden" id="update_error"> <span>{{update_error}}</span></div>
       <div class="btn btn-primary" id="check_for_update">{{_('Check for Update')}}</div>
       <div class="btn btn-primary hidden" id="perform_update" data-toggle="modal" data-target="#StatusDialog">{{_('Perform Update')}}</div>

From ae1f515446e7ee1f31700df42b810a0ce1061cf5 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 27 Dec 2021 20:02:42 +0100
Subject: [PATCH 042/220] Bugfix uncheck all ekements in books list and user
 list Improved testability for books list

---
 cps/static/js/table.js        | 30 +++++++++++++++---------------
 cps/templates/book_table.html |  4 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index e98f6a8b..112ca957 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -47,15 +47,15 @@ $(function() {
             var rows = rowsAfter;
 
             if (e.type === "uncheck-all") {
-                rows = rowsBefore;
+                selections = [];
+            } else {
+                var ids = $.map(!$.isArray(rows) ? [rows] : rows, function (row) {
+                    return row.id;
+                });
+
+                var func = $.inArray(e.type, ["check", "check-all"]) > -1 ? "union" : "difference";
+                selections = window._[func](selections, ids);
             }
-
-            var ids = $.map(!$.isArray(rows) ? [rows] : rows, function (row) {
-                return row.id;
-            });
-
-            var func = $.inArray(e.type, ["check", "check-all"]) > -1 ? "union" : "difference";
-            selections = window._[func](selections, ids);
             if (selections.length >= 2) {
                 $("#merge_books").removeClass("disabled");
                 $("#merge_books").attr("aria-disabled", false);
@@ -540,14 +540,14 @@ $(function() {
         var rows = rowsAfter;
 
         if (e.type === "uncheck-all") {
-            rows = rowsBefore;
+            selections = [];
+        } else {
+	        var ids = $.map(!$.isArray(rows) ? [rows] : rows, function (row) {
+	            return row.id;
+	        });
+	        var func = $.inArray(e.type, ["check", "check-all"]) > -1 ? "union" : "difference";
+            selections = window._[func](selections, ids);
         }
-
-        var ids = $.map(!$.isArray(rows) ? [rows] : rows, function (row) {
-            return row.id;
-        });
-        var func = $.inArray(e.type, ["check", "check-all"]) > -1 ? "union" : "difference";
-        selections = window._[func](selections, ids);
         handle_header_buttons();
     });
 });
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index fb0cfed8..eb5c1bff 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -120,8 +120,8 @@
             <div class="text-left" id="merge_to"></div>
         </div>
       <div class="modal-footer">
-        <input type="button" class="btn btn-danger" value="{{_('Merge')}}" name="merge_confirm" id="merge_confirm" data-dismiss="modal">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
+        <input id="merge_confirm"  type="button" class="btn btn-danger" value="{{_('Merge')}}" name="merge_confirm" id="merge_confirm" data-dismiss="modal">
+        <button id="merge_abort" type="button" class="btn btn-default" data-dismiss="modal">{{_('Cancel')}}</button>
       </div>
     </div>
   </div>

From c095ee3c144765ed559861caef2d0b045f704329 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 28 Dec 2021 11:31:32 +0100
Subject: [PATCH 043/220] Fix #2243 (whitespaces are trimmed also for normal
 search)

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

diff --git a/cps/web.py b/cps/web.py
index 81c37711..e139848e 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1069,7 +1069,7 @@ def reconnect():
 def search():
     term = request.args.get("query")
     if term:
-        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term))
+        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term.strip()))
     else:
         return render_title_template('search.html',
                                      searchterm="",

From a90177afa0bd1846cf7cbb92b93b770aff065082 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 28 Dec 2021 20:17:51 +0100
Subject: [PATCH 044/220] Better version output in about page (exe file, pyPi,
 git commit string removed if empty)

---
 cps/about.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index ba5a99af..7e839520 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -74,13 +74,22 @@ opt = dep_check.load_dependencys(True)
 for i in (req + opt):
     ret[i[1]] = i[0]
 
+if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
+    calibre_web_version = constants.STABLE_VERSION['version']
+else:
+    calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
+                    + constants.NIGHTLY_VERSION[0].replace('%','%%') + ' - '
+                    + constants.NIGHTLY_VERSION[1].replace('%','%%'))
+if getattr(sys, 'frozen', False):
+    calibre_web_version += " - Exe-Version"
+elif constants.HOME_CONFIG:
+    calibre_web_version += " - pyPi"
+
 if not ret:
     _VERSIONS = OrderedDict(
         Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
         Python=sys.version,
-        Calibre_Web=constants.STABLE_VERSION['version'] + ' - '
-                    + constants.NIGHTLY_VERSION[0].replace('%','%%') + ' - '
-                    + constants.NIGHTLY_VERSION[1].replace('%','%%'),
+        Calibre_Web=calibre_web_version,
         WebServer=server.VERSION,
         Flask=flask.__version__,
         Flask_Login=flask_loginVersion,
@@ -110,9 +119,7 @@ else:
     _VERSIONS = OrderedDict(
         Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
         Python = sys.version,
-        Calibre_Web = constants.STABLE_VERSION['version'] + ' - '
-                      + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
-                      + constants.NIGHTLY_VERSION[1].replace('%', '%%'),
+        Calibre_Web=calibre_web_version,
         Werkzeug = werkzeug.__version__,
         Jinja2=jinja2.__version__,
         pySqlite = sqlite3.version,

From c1030dfd1340ff65f9b4ea2d20a8c048b7db2e14 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 30 Dec 2021 14:44:35 +0100
Subject: [PATCH 045/220] Update dependency scholary

---
 optional-requirements.txt | 2 +-
 setup.cfg                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index c0009c94..b90951aa 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -31,7 +31,7 @@ SQLAlchemy-Utils>=0.33.5,<0.38.0
 
 # extracting metadata
 rarfile>=2.7
-scholarly>=1.2.0, <1.5
+scholarly>=1.2.0, <1.6
 
 # other
 natsort>=2.2.0,<8.1.0
diff --git a/setup.cfg b/setup.cfg
index 95f3502d..a81102b8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -82,7 +82,7 @@ oauth =
     SQLAlchemy-Utils>=0.33.5,<0.38.0
 metadata =
     rarfile>=2.7
-    scholarly>=1.2.0,<1.5
+    scholarly>=1.2.0,<1.6
 comics =
     natsort>=2.2.0,<8.1.0
     comicapi>= 2.2.0,<2.3.0

From bbadfa22511c2ae8fb4cdcaa326ccc1be66a07f4 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 4 Jan 2022 21:11:52 +0100
Subject: [PATCH 046/220] bugfixes load metadata

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

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index 5ff078b9..df387831 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -43,7 +43,7 @@ class scholar(Metadata):
                 v['tags'] = []
                 v['rating'] = 0
                 v['series'] = ""
-                v['cover'] = generic_cover
+                v['cover'] = ""
                 v['url'] = publication.get('pub_url') or publication.get('eprint_url') or "",
                 v['source'] = {
                     "id": self.__id__,
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index cac3219c..9d2ac14e 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -226,7 +226,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="metaModalLabel">{{_('Fetch Metadata')}}</h4>
+        <h4 class="modal-title text-center" id="metaModalLabel">{{_('Fetch Metadata')}}</h4>
         <form class="padded-bottom" id="meta-search">
           <div class="input-group">
             <label class="sr-only" for="keyword">{{_('Keyword')}}</label>
@@ -275,7 +275,7 @@
         <p>{{_('Description')}}: <%= description %></p>
       <% } %>
       <p>{{_('Source')}}:
-        <a href="<%= source.url %>" target="_blank" rel="noopener"><%= source.description %></a>
+        <a href="<%= source.link %>" target="_blank" rel="noopener"><%= source.description %></a>
       </p>
     </div>
   </li>

From 6d839d5cc71cbb8f839fb95365f838d8fd01f94c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 4 Jan 2022 21:12:59 +0100
Subject: [PATCH 047/220] Bugfixes from testrun

---
 cps/editbooks.py                        |   11 +-
 cps/static/js/main.js                   |    5 +-
 test/Calibre-Web TestSummary_Linux.html | 1035 ++++++++++-------------
 3 files changed, 461 insertions(+), 590 deletions(-)
 mode change 100644 => 100755 cps/editbooks.py
 mode change 100644 => 100755 cps/static/js/main.js

diff --git a/cps/editbooks.py b/cps/editbooks.py
old mode 100644
new mode 100755
index b6fdc164..e20cfcfb
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -357,7 +357,16 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
         else:
             # book not found
             log.error('Book with id "%s" could not be deleted: not found', book_id)
-    return render_delete_book_result(book_format, jsonResponse, warning, book_id)
+        return render_delete_book_result(book_format, jsonResponse, warning, book_id)
+    message = _("You are missing permissions to delete books")
+    if jsonResponse:
+        return json.dumps({"location": url_for("editbook.edit_book", book_id=book_id),
+                           "type": "danger",
+                           "format": "",
+                           "message": message})
+    else:
+        flash(message, category="error")
+        return redirect(url_for('editbook.edit_book', book_id=book_id))
 
 
 def render_edit_book(book_id):
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
old mode 100644
new mode 100755
index e8da76ef..cf5a4327
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -198,7 +198,7 @@ function confirmDialog(id, dialogid, dataValue, yesFn, noFn) {
     $confirm.modal('show');
 }
 
-$("#delete_confirm").click(function() {
+$("#delete_confirm").click(function(event) {
     //get data-id attribute of the clicked element
     var deleteId = $(this).data("delete-id");
     var bookFormat = $(this).data("delete-format");
@@ -228,8 +228,7 @@ $("#delete_confirm").click(function() {
                 }
             });
         } else {
-            window.location.href = getPath() + "/delete/" + deleteId;
-
+            postButton(event, getPath() + "/delete/" + deleteId);
         }
     }
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index d291d368..511300be 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2021-12-22 20:24:40</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-02 17:11:15</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>2021-12-23 00:00:41</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-02 21:33:59</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>2h 57 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 43 min</p>
         </div>
       </div>
       </div>
@@ -411,21 +411,50 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
+        <td class="text-center">15</td>
         <td class="text-center">14</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 14)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id="ft6.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 643, in test_calibre_log
+    self.assertTrue(&#34; …&#34; in data)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
@@ -434,7 +463,7 @@
     
     
     
-        <tr id='pt6.2' class='hiddenRow bg-success'>
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
@@ -443,7 +472,7 @@
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
@@ -452,7 +481,7 @@
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -461,7 +490,7 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -470,7 +499,7 @@
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
@@ -479,7 +508,7 @@
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id='pt6.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
@@ -488,7 +517,7 @@
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id='pt6.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
@@ -497,7 +526,7 @@
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id='pt6.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
@@ -506,7 +535,7 @@
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
@@ -515,7 +544,7 @@
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id='pt6.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -524,7 +553,7 @@
     
     
     
-        <tr id='pt6.12' class='hiddenRow bg-success'>
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -533,7 +562,7 @@
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -542,7 +571,7 @@
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
@@ -782,11 +811,31 @@
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id="ft10.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</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.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 657, in test_title_sort
+    self.assertEqual(7, len(self.search(&#39; book &#39;)))
+AssertionError: 7 != 6</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -844,31 +893,11 @@
     
     
     
-        <tr id="ft10.13" class="none bg-danger">
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 300, in test_writeonly_path
-    self.assertTrue(os.path.isdir(book_path))
-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>
     
     
@@ -901,11 +930,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
-        <td class="text-center">32</td>
-        <td class="text-center">2</td>
+        <td class="text-center">34</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -924,31 +953,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft11.2" class="none bg-danger">
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 177, in test_edit_author
-    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, &#39;O0u Zhi&#39;, &#39;book8 (8)&#39;)))
-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>
     
     
@@ -1097,31 +1106,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft11.19" class="none bg-danger">
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.19')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.19').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 74, in test_edit_title
-    self.assertTrue(os.path.isdir(os.path.join(TEST_DB, values[&#39;author&#39;][0], &#39;O0u Zhi (4)&#39;)))
-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>
     
     
@@ -1466,20 +1455,64 @@ AssertionError: False is not true</pre>
 
 
     <tr id="su" class="failClass">
-        <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
-        <td class="text-center">18</td>
-        <td class="text-center">2</td>
+        <td>TestEditMetadata</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</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('c13', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditMetadata - test_upload_book_lit</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 48, in test_upload_book_lit
+    self.assertEqual(&#34;&#34;, self.check_element_on_page((By.ID, &#34;Der Buchtitel&#34;)))
+AssertionError: &#39;&#39; != False</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">20</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('c14', 20)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1488,36 +1521,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft13.2" class="none bg-danger">
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 297, in test_edit_author
-    self.assertTrue(gdrive_path)
-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>
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1526,7 +1539,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1535,7 +1548,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1544,7 +1557,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1553,7 +1566,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1562,7 +1575,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1571,7 +1584,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1580,7 +1593,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1589,7 +1602,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1598,7 +1611,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1607,7 +1620,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1616,7 +1629,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1625,7 +1638,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1634,36 +1647,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft13.16" class="none bg-danger">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 143, in test_edit_title
-    self.assertTrue(gdrive_path)
-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>
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1672,7 +1665,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1681,7 +1674,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.19' class='hiddenRow bg-success'>
+        <tr id='pt14.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1690,7 +1683,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt13.20' class='hiddenRow bg-success'>
+        <tr id='pt14.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1708,13 +1701,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 3)">Detail</a>
+            <a onclick="showClassDetail('c15', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1723,7 +1716,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1732,7 +1725,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1750,13 +1743,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 7)">Detail</a>
+            <a onclick="showClassDetail('c16', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1765,7 +1758,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1774,7 +1767,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1783,7 +1776,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1792,7 +1785,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1801,7 +1794,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1810,7 +1803,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1828,13 +1821,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1852,13 +1845,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1876,13 +1869,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -1900,13 +1893,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1924,13 +1917,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 3)">Detail</a>
+            <a onclick="showClassDetail('c21', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1939,7 +1932,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -1948,7 +1941,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -1966,13 +1959,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 11)">Detail</a>
+            <a onclick="showClassDetail('c22', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -1981,7 +1974,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -1990,7 +1983,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -1999,7 +1992,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.4' class='hiddenRow bg-success'>
+        <tr id='pt22.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2008,7 +2001,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.5' class='hiddenRow bg-success'>
+        <tr id='pt22.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2017,7 +2010,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.6' class='hiddenRow bg-success'>
+        <tr id='pt22.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2026,7 +2019,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.7' class='hiddenRow bg-success'>
+        <tr id='pt22.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2035,7 +2028,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.8' class='hiddenRow bg-success'>
+        <tr id='pt22.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2044,7 +2037,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.9' class='hiddenRow bg-success'>
+        <tr id='pt22.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2053,7 +2046,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.10' class='hiddenRow bg-success'>
+        <tr id='pt22.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2062,7 +2055,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt21.11' class='hiddenRow bg-success'>
+        <tr id='pt22.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2080,13 +2073,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 5)">Detail</a>
+            <a onclick="showClassDetail('c23', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2095,7 +2088,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2104,7 +2097,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2113,7 +2106,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2122,7 +2115,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2140,13 +2133,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 13)">Detail</a>
+            <a onclick="showClassDetail('c24', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2155,7 +2148,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2164,7 +2157,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2173,7 +2166,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2182,7 +2175,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2191,7 +2184,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2200,7 +2193,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2209,7 +2202,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2218,7 +2211,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2227,7 +2220,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.10' class='hiddenRow bg-success'>
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2236,7 +2229,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2245,7 +2238,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.12' class='hiddenRow bg-success'>
+        <tr id='pt24.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2254,7 +2247,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt23.13' class='hiddenRow bg-success'>
+        <tr id='pt24.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2272,13 +2265,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 8)">Detail</a>
+            <a onclick="showClassDetail('c25', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2287,7 +2280,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2296,7 +2289,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2305,7 +2298,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2314,7 +2307,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2323,7 +2316,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2332,7 +2325,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2341,7 +2334,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2359,13 +2352,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('c25', 9)">Detail</a>
+            <a onclick="showClassDetail('c26', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2374,7 +2367,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2383,7 +2376,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2392,7 +2385,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2401,19 +2394,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st25.5" class="none bg-warning">
+        <tr id="st26.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st25.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st26.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_st25.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st26.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2427,7 +2420,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2436,7 +2429,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2445,7 +2438,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2454,7 +2447,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2472,13 +2465,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 15)">Detail</a>
+            <a onclick="showClassDetail('c27', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2487,7 +2480,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2496,7 +2489,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2505,7 +2498,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2514,7 +2507,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2523,7 +2516,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2532,7 +2525,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2541,7 +2534,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2550,7 +2543,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2559,7 +2552,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2568,7 +2561,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2577,7 +2570,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2586,7 +2579,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2595,7 +2588,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.14' class='hiddenRow bg-success'>
+        <tr id='pt27.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2604,7 +2597,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.15' class='hiddenRow bg-success'>
+        <tr id='pt27.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2622,24 +2615,24 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 2)">Detail</a>
+            <a onclick="showClassDetail('c28', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
+                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_merge_book</div>
+                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2655,13 +2648,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 2)">Detail</a>
+            <a onclick="showClassDetail('c29', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2670,7 +2663,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2688,13 +2681,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 23)">Detail</a>
+            <a onclick="showClassDetail('c30', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2703,7 +2696,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2712,7 +2705,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2721,7 +2714,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2730,7 +2723,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2739,7 +2732,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2748,7 +2741,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2757,7 +2750,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2766,7 +2759,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2775,7 +2768,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2784,7 +2777,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2793,7 +2786,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2802,7 +2795,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2811,7 +2804,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2820,7 +2813,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2829,7 +2822,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.16' class='hiddenRow bg-success'>
+        <tr id='pt30.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2838,7 +2831,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.17' class='hiddenRow bg-success'>
+        <tr id='pt30.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2847,7 +2840,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.18' class='hiddenRow bg-success'>
+        <tr id='pt30.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2856,7 +2849,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.19' class='hiddenRow bg-success'>
+        <tr id='pt30.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2865,7 +2858,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.20' class='hiddenRow bg-success'>
+        <tr id='pt30.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2874,7 +2867,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.21' class='hiddenRow bg-success'>
+        <tr id='pt30.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2883,7 +2876,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.22' class='hiddenRow bg-success'>
+        <tr id='pt30.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2892,7 +2885,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.23' class='hiddenRow bg-success'>
+        <tr id='pt30.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2910,13 +2903,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 1)">Detail</a>
+            <a onclick="showClassDetail('c31', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -2934,13 +2927,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 5)">Detail</a>
+            <a onclick="showClassDetail('c32', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -2949,7 +2942,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -2958,7 +2951,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -2967,7 +2960,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -2976,7 +2969,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -2994,13 +2987,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 8)">Detail</a>
+            <a onclick="showClassDetail('c33', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3009,7 +3002,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3018,7 +3011,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3027,7 +3020,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3036,7 +3029,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3045,7 +3038,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3054,7 +3047,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3063,7 +3056,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt32.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3081,13 +3074,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 3)">Detail</a>
+            <a onclick="showClassDetail('c34', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3096,7 +3089,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3105,7 +3098,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3123,13 +3116,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('c34', 14)">Detail</a>
+            <a onclick="showClassDetail('c35', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3138,7 +3131,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3147,7 +3140,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3156,7 +3149,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3165,7 +3158,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3174,7 +3167,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt35.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3183,7 +3176,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt35.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3192,7 +3185,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt35.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3201,7 +3194,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt35.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3210,7 +3203,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt35.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3219,7 +3212,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt35.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3228,19 +3221,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st34.12" class="none bg-warning">
+        <tr id="st35.12" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st34.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st35.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st34.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st35.12" 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_st34.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st35.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3254,7 +3247,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt35.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3263,7 +3256,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt35.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3281,13 +3274,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('c35', 9)">Detail</a>
+            <a onclick="showClassDetail('c36', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3296,7 +3289,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3305,7 +3298,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3314,7 +3307,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3323,7 +3316,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3332,7 +3325,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3341,19 +3334,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st35.7" class="none bg-warning">
+        <tr id="st36.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st35.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st35.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.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_st35.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3367,7 +3360,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3376,7 +3369,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.9' class='hiddenRow bg-success'>
+        <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3386,21 +3379,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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">
-            <a onclick="showClassDetail('c36', 2)">Detail</a>
+            <a onclick="showClassDetail('c37', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3409,31 +3402,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft36.2" class="none bg-danger">
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft36.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft36.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft36.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 128, in test_upload_epub_lang
-    self.assertEqual(len(self.adv_search({u&#39;include_language&#39;: u&#39;Tedesco&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3447,13 +3420,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 18)">Detail</a>
+            <a onclick="showClassDetail('c38', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3462,7 +3435,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3471,7 +3444,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3480,7 +3453,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3489,7 +3462,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3498,7 +3471,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3507,7 +3480,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3516,7 +3489,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3525,7 +3498,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3534,7 +3507,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.10' class='hiddenRow bg-success'>
+        <tr id='pt38.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3543,7 +3516,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.11' class='hiddenRow bg-success'>
+        <tr id='pt38.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3552,7 +3525,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.12' class='hiddenRow bg-success'>
+        <tr id='pt38.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3561,7 +3534,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.13' class='hiddenRow bg-success'>
+        <tr id='pt38.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3570,7 +3543,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.14' class='hiddenRow bg-success'>
+        <tr id='pt38.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3579,7 +3552,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.15' class='hiddenRow bg-success'>
+        <tr id='pt38.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3588,7 +3561,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.16' class='hiddenRow bg-success'>
+        <tr id='pt38.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3597,7 +3570,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.17' class='hiddenRow bg-success'>
+        <tr id='pt38.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3606,7 +3579,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt37.18' class='hiddenRow bg-success'>
+        <tr id='pt38.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3624,13 +3597,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c39', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3648,13 +3621,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 21)">Detail</a>
+            <a onclick="showClassDetail('c40', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3663,7 +3636,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3672,7 +3645,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3681,7 +3654,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3690,7 +3663,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3699,7 +3672,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3708,7 +3681,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3717,7 +3690,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3726,7 +3699,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3735,7 +3708,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3744,7 +3717,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3753,7 +3726,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3762,7 +3735,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3771,7 +3744,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3780,7 +3753,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3789,7 +3762,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3798,7 +3771,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3807,7 +3780,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3816,7 +3789,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.19' class='hiddenRow bg-success'>
+        <tr id='pt40.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3825,7 +3798,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.20' class='hiddenRow bg-success'>
+        <tr id='pt40.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3834,7 +3807,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt39.21' class='hiddenRow bg-success'>
+        <tr id='pt40.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3852,13 +3825,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 34)">Detail</a>
+            <a onclick="showClassDetail('c41', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -3867,7 +3840,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -3876,7 +3849,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -3885,7 +3858,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -3894,7 +3867,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -3903,7 +3876,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -3912,7 +3885,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -3921,7 +3894,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -3930,7 +3903,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3939,7 +3912,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -3948,7 +3921,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -3957,7 +3930,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -3966,7 +3939,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -3975,7 +3948,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -3984,7 +3957,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -3993,7 +3966,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4002,7 +3975,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4011,7 +3984,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4020,7 +3993,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.19' class='hiddenRow bg-success'>
+        <tr id='pt41.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4029,7 +4002,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.20' class='hiddenRow bg-success'>
+        <tr id='pt41.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4038,7 +4011,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.21' class='hiddenRow bg-success'>
+        <tr id='pt41.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4047,7 +4020,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.22' class='hiddenRow bg-success'>
+        <tr id='pt41.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4056,7 +4029,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.23' class='hiddenRow bg-success'>
+        <tr id='pt41.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4065,7 +4038,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.24' class='hiddenRow bg-success'>
+        <tr id='pt41.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4074,7 +4047,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.25' class='hiddenRow bg-success'>
+        <tr id='pt41.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4083,7 +4056,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.26' class='hiddenRow bg-success'>
+        <tr id='pt41.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4092,7 +4065,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.27' class='hiddenRow bg-success'>
+        <tr id='pt41.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4101,7 +4074,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.28' class='hiddenRow bg-success'>
+        <tr id='pt41.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4110,7 +4083,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.29' class='hiddenRow bg-success'>
+        <tr id='pt41.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4119,7 +4092,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.30' class='hiddenRow bg-success'>
+        <tr id='pt41.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4128,7 +4101,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.31' class='hiddenRow bg-success'>
+        <tr id='pt41.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4137,7 +4110,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.32' class='hiddenRow bg-success'>
+        <tr id='pt41.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4146,7 +4119,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.33' class='hiddenRow bg-success'>
+        <tr id='pt41.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4155,7 +4128,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt40.34' class='hiddenRow bg-success'>
+        <tr id='pt41.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4165,21 +4138,21 @@ AssertionError: 0 != 1</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreHelper</td>
         <td class="text-center">16</td>
-        <td class="text-center">11</td>
-        <td class="text-center">5</td>
+        <td class="text-center">16</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('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c42', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4188,7 +4161,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4197,7 +4170,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4206,7 +4179,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4215,7 +4188,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4224,7 +4197,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4233,7 +4206,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4242,100 +4215,34 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id="ft41.8" class="none bg-danger">
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 44, in test_check_chinese_Characters
-    self.assertEqual(helper.get_valid_filename(u&#39;执一&#39;), u&#39;Zhi Yi&#39;)
-AssertionError: &#39;执一&#39; != &#39;Zhi Yi&#39;
-- 执一
-+ Zhi Yi</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.9" class="none bg-danger">
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 71, in test_check_deg_eur_replacement
-    self.assertEqual(helper.get_valid_filename(u&#39;°€&#39;), u&#39;degEUR&#39;)
-AssertionError: &#39;°€&#39; != &#39;degEUR&#39;
-- °€
-+ degEUR</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.10" class="none bg-danger">
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 36, in test_check_doubleS
-    self.assertEqual(helper.get_valid_filename(u&#39;§ß&#39;), u&#39;SSss&#39;)
-AssertionError: &#39;§ß&#39; != &#39;SSss&#39;
-- §ß
-+ SSss</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4344,69 +4251,25 @@ AssertionError: &#39;§ß&#39; != &#39;SSss&#39;
     
     
     
-        <tr id="ft41.12" class="none bg-danger">
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.12')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 32, in test_check_high23
-    self.assertEqual(helper.get_valid_filename(u&#39;²³&#39;), u&#39;23&#39;)
-AssertionError: &#39;²³&#39; != &#39;23&#39;
-- ²³
-+ 23</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.13" class="none bg-danger">
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 40, in test_check_umlauts
-    self.assertEqual(helper.get_valid_filename(u&#39;ÄÜÖäöü&#39;), u&#39;AUOaou&#39;)
-AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
-- ÄÜÖäöü
-+ AUOaou</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4415,7 +4278,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4424,7 +4287,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4435,9 +4298,9 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>378</td>
-        <td>361</td>
-        <td>11</td>
+        <td>380</td>
+        <td>371</td>
+        <td>3</td>
         <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
@@ -4563,7 +4426,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.28</td>
+              <td>1.4.29</td>
               <td>Basic</td>
             </tr>
           
@@ -4767,13 +4630,13 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.2</td>
+              <td>4.3.3</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.2</td>
+              <td>4.3.3</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -4785,7 +4648,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.2</td>
+              <td>4.3.3</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4803,7 +4666,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.38.1</td>
+              <td>0.38.2</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -4815,7 +4678,7 @@ AssertionError: &#39;ÄÜÖäöü&#39; != &#39;AUOaou&#39;
 </div>
 
 <script>
-    drawCircle(361, 11, 0, 6);
+    drawCircle(371, 3, 0, 6);
     showCase(5);
 </script>
 

From 405f3c181f3a23cc2e35089eec2949405f07f637 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 6 Jan 2022 14:04:49 +0100
Subject: [PATCH 048/220] Added korean locale

---
 README.md                                     |    2 +-
 cps/iso_language_names.py                     |  418 +++
 .../locales/bootstrap-datepicker.ko.min.js    |    1 +
 cps/static/js/libs/tinymce/langs/ko.js        |  261 ++
 cps/translations/cs/LC_MESSAGES/messages.mo   |  Bin 39546 -> 39449 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/de/LC_MESSAGES/messages.mo   |  Bin 56158 -> 56049 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/el/LC_MESSAGES/messages.mo   |  Bin 57741 -> 57609 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/es/LC_MESSAGES/messages.mo   |  Bin 51330 -> 51225 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   |  Bin 27430 -> 27338 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   |  Bin 53669 -> 53561 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/hu/LC_MESSAGES/messages.mo   |  Bin 25180 -> 25073 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/it/LC_MESSAGES/messages.mo   |  Bin 56299 -> 56197 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   |  Bin 19843 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/km/LC_MESSAGES/messages.mo   |  Bin 24546 -> 24354 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |  283 +-
 cps/translations/ko/LC_MESSAGES/messages.mo   |  Bin 0 -> 56464 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   | 3174 +++++++++++++++++
 cps/translations/nl/LC_MESSAGES/messages.mo   |  Bin 50497 -> 50392 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   |  Bin 52413 -> 52304 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |  284 +-
 .../pt_BR/LC_MESSAGES/messages.mo             |  Bin 46930 -> 46828 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |  284 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   |  Bin 47969 -> 47824 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   |  Bin 48760 -> 48661 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   |  Bin 22790 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |  284 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   |  Bin 18028 -> 17885 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |  283 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 50104 -> 50015 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |  284 +-
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        |  Bin 48886 -> 48797 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |  284 +-
 messages.pot                                  |  287 +-
 45 files changed, 6734 insertions(+), 2803 deletions(-)
 create mode 100644 cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js
 create mode 100644 cps/static/js/libs/tinymce/langs/ko.js
 create mode 100644 cps/translations/ko/LC_MESSAGES/messages.mo
 create mode 100644 cps/translations/ko/LC_MESSAGES/messages.po

diff --git a/README.md b/README.md
index 896d4535..ea9d9ba0 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 - full graphical setup
 - User management with fine-grained per-user permissions
 - Admin interface
-- User Interface in brazilian, czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian
+- User Interface in brazilian, czech, dutch, english, finnish, french, german, greek, hungarian, italian, japanese, khmer, korean, polish, russian, simplified and traditional chinese, spanish, swedish, turkish, ukrainian
 - OPDS feed for eBook reader apps 
 - Filter and search by titles, authors, tags, series and language
 - Create a custom book collection (shelves)
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 11e5e67b..0507b6f7 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -55,6 +55,7 @@ LANGUAGE_NAMES = {
         "bik": "bikolština",
         "bin": "bini",
         "bis": "bislamština",
+        "bit": "berinomo",
         "bla": "siksika",
         "bod": "tibetština",
         "bos": "bosenština",
@@ -163,6 +164,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligayonština",
         "hin": "hindština",
         "hit": "chetitština",
+        "hmj": "Ge",
         "hmn": "hmongština",
         "hmo": "hiri motu",
         "hrv": "chorvatština",
@@ -477,6 +479,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Blackfoot",
         "bod": "Tibetisch",
         "bos": "Bosnisch",
@@ -585,6 +588,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hethitisch",
+        "hmj": "Ge",
         "hmn": "Miao-Sprachen",
         "hmo": "Hiri-Motu",
         "hrv": "Kroatisch",
@@ -894,6 +898,7 @@ LANGUAGE_NAMES = {
         "bel": "Λευκωρωσικά",
         "bem": "Bemba (Zambia)",
         "ben": "Μπενγκάλι",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -968,6 +973,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Γεωργιανά",
         "deu": "Γερμανικά",
@@ -1276,6 +1282,7 @@ LANGUAGE_NAMES = {
         "bik": "Bicolano",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksiká",
         "bod": "Tibetano",
         "bos": "Bosnio",
@@ -1384,6 +1391,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainón",
         "hin": "Hindi",
         "hit": "Hitita",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croata",
@@ -1698,6 +1706,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "mustajalka (siksika)",
         "bod": "tiibetti",
         "bos": "bosnia",
@@ -1806,6 +1815,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "heetti",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri-motu",
         "hrv": "kroatia",
@@ -2120,6 +2130,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "bislama",
+        "bit": "berinomo",
         "bla": "pied-noir",
         "bod": "tibétain",
         "bos": "bosniaque",
@@ -2228,6 +2239,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligaynon",
         "hin": "hindi",
         "hit": "hittite",
+        "hmj": "ge",
         "hmn": "hmong",
         "hmo": "hiri Motu",
         "hrv": "croate",
@@ -2542,6 +2554,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "bini",
         "bis": "biszlama",
+        "bit": "Berinomo",
         "bla": "szikszika",
         "bod": "tibeti",
         "bos": "bosnyák",
@@ -2650,6 +2663,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hettita",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "horvát",
@@ -2964,6 +2978,7 @@ LANGUAGE_NAMES = {
         "bik": "bicol",
         "bin": "Bini",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetano",
         "bos": "Bosniaco",
@@ -3072,6 +3087,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligayna",
         "hin": "Hindi",
         "hit": "hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri motu",
         "hrv": "Croato",
@@ -3386,6 +3402,7 @@ LANGUAGE_NAMES = {
         "bik": "ビコル語",
         "bin": "ビニ語",
         "bis": "ビスラマ語",
+        "bit": "Berinomo",
         "bla": "ブラックフット語",
         "bod": "チベット語",
         "bos": "ボスニア語",
@@ -3494,6 +3511,7 @@ LANGUAGE_NAMES = {
         "hil": "ヒリジャノン語",
         "hin": "ヒンディー語",
         "hit": "ヒッタイト語",
+        "hmj": "Ge",
         "hmn": "フモング語",
         "hmo": "ヒリモトゥ語",
         "hrv": "クロアチア語",
@@ -3808,6 +3826,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -3916,6 +3935,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
@@ -4187,6 +4207,383 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
+    "ko": {
+        "abk": "압하스어",
+        "ace": "아체어",
+        "ach": "아촐리어",
+        "ada": "Adangme",
+        "ady": "Adyghe",
+        "aar": "아파르어",
+        "afh": "Afrihili",
+        "afr": "아프리칸스어",
+        "ain": "Ainu (Japan)",
+        "aka": "Akan",
+        "akk": "Akkadian",
+        "sqi": "Albanian",
+        "ale": "Aleut",
+        "amh": "Amharic",
+        "anp": "Angika",
+        "ara": "아라비아어",
+        "arg": "Aragonese",
+        "arp": "Arapaho",
+        "arw": "Arawak",
+        "hye": "아르메니아어",
+        "asm": "Assamese",
+        "ast": "Asturian",
+        "ava": "Avaric",
+        "ave": "아베스타어",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Azerbaijani",
+        "ban": "발리 문자",
+        "bal": "Baluchi",
+        "bam": "Bambara",
+        "bas": "Basa (Cameroon)",
+        "bak": "Bashkir",
+        "eus": "바스크어",
+        "bej": "Beja",
+        "bel": "벨로루시어",
+        "bem": "Bemba (Zambia)",
+        "ben": "벵골 문자",
+        "bit": "Berinomo",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "byn": "Bilin",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "zbl": "Blissymbols",
+        "bos": "Bosnian",
+        "bra": "Braj",
+        "bre": "Breton",
+        "bug": "부기 문자",
+        "bul": "불가리아어",
+        "bua": "Buriat",
+        "mya": "Burmese",
+        "cad": "Caddo",
+        "cat": "카탈로니아어",
+        "ceb": "Cebuano",
+        "chg": "Chagatai",
+        "cha": "Chamorro",
+        "che": "Chechen",
+        "chr": "체로키 문자",
+        "chy": "Cheyenne",
+        "chb": "Chibcha",
+        "zho": "중국어",
+        "chn": "Chinook jargon",
+        "chp": "Chipewyan",
+        "cho": "Choctaw",
+        "cht": "Cholón",
+        "chk": "Chuukese",
+        "chv": "Chuvash",
+        "cop": "콥트어",
+        "cor": "Cornish",
+        "cos": "Corsican",
+        "cre": "Cree",
+        "mus": "Creek",
+        "hrv": "크로아티아어",
+        "ces": "체크어",
+        "dak": "Dakota",
+        "dan": "덴마크어",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "div": "Dhivehi",
+        "din": "Dinka",
+        "doi": "Dogri (macrolanguage)",
+        "dgr": "Dogrib",
+        "dua": "Duala",
+        "nld": "네덜란드어",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efik",
+        "egy": "Egyptian (Ancient)",
+        "eka": "Ekajuk",
+        "elx": "Elamite",
+        "eng": "영어",
+        "enu": "Enu",
+        "myv": "Erzya",
+        "epo": "에스페란토어",
+        "est": "에스토니아어",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fat": "Fanti",
+        "fao": "페로스어",
+        "fij": "Fijian",
+        "fil": "Filipino",
+        "fin": "핀란드어",
+        "fon": "Fon",
+        "fra": "프랑스어",
+        "fur": "Friulian",
+        "ful": "Fulah",
+        "gaa": "Ga",
+        "glg": "Galician",
+        "lug": "Ganda",
+        "gay": "Gayo",
+        "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
+        "gez": "Geez",
+        "kat": "그루지야어",
+        "deu": "독일어",
+        "gil": "Gilbertese",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "고트어",
+        "grb": "Grebo",
+        "grn": "Guarani",
+        "guj": "구자라트 문자",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hau": "Hausa",
+        "haw": "Hawaiian",
+        "heb": "헤브루어",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "Hindi",
+        "hmo": "Hiri Motu",
+        "hit": "Hittite",
+        "hmn": "Hmong",
+        "hun": "헝가리어",
+        "hup": "Hupa",
+        "iba": "Iban",
+        "isl": "아이슬란드어",
+        "ido": "Ido",
+        "ibo": "Igbo",
+        "ilo": "Iloko",
+        "ind": "인도네시아어",
+        "inh": "Ingush",
+        "ina": "Interlingua (International Auxiliary Language Association)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiaq",
+        "gle": "아일랜드어",
+        "ita": "이탈리아어",
+        "jpn": "일본어",
+        "jav": "Javanese",
+        "jrb": "Judeo-Arabic",
+        "jpr": "Judeo-Persian",
+        "kbd": "Kabardian",
+        "kab": "Kabyle",
+        "kac": "Kachin",
+        "kal": "Kalaallisut",
+        "xal": "Kalmyk",
+        "kam": "Kamba (Kenya)",
+        "kan": " 칸나다 문자",
+        "kau": "Kanuri",
+        "kaa": "Kara-Kalpak",
+        "krc": "Karachay-Balkar",
+        "krl": "Karelian",
+        "kas": "Kashmiri",
+        "csb": "Kashubian",
+        "kaw": "Kawi",
+        "kaz": "Kazakh",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirghiz",
+        "tlh": "Klingon",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kok": "Konkani (macrolanguage)",
+        "kor": "한국어",
+        "kos": "Kosraean",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "Kurdish",
+        "kru": "Kurukh",
+        "kut": "Kutenai",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "라오 문자",
+        "lat": "Latin",
+        "lav": "라트비아어",
+        "lez": "Lezghian",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "리투아니아어",
+        "jbo": "Lojban",
+        "loz": "Lozi",
+        "lub": "Luba-Katanga",
+        "lua": "Luba-Lulua",
+        "lui": "Luiseno",
+        "smj": "Lule Sami",
+        "lun": "Lunda",
+        "luo": "Luo (Kenya and Tanzania)",
+        "lus": "Lushai",
+        "ltz": "Luxembourgish",
+        "mkd": "마케도니아어",
+        "mad": "Madurese",
+        "mag": "Magahi",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mlg": "Malagasy",
+        "msa": "Malay (macrolanguage)",
+        "mal": "말라얄람 문자",
+        "mlt": "Maltese",
+        "mnc": "Manchu",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri",
+        "glv": "Manx",
+        "mri": "Maori",
+        "arn": "Mapudungun",
+        "mar": "Marathi",
+        "chm": "Mari (Russia)",
+        "mah": "Marshallese",
+        "mwr": "Marwari",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mwl": "Mirandese",
+        "moh": "Mohawk",
+        "mdf": "Moksha",
+        "lol": "Mongo",
+        "mon": "몽골 문자",
+        "mos": "Mossi",
+        "mul": "Multiple languages",
+        "nqo": "응코 문자",
+        "nau": "나우루어",
+        "nav": "나바호어",
+        "ndo": "Ndonga",
+        "nap": "Neapolitan",
+        "nia": "Nias",
+        "niu": "Niuean",
+        "zxx": "No linguistic content",
+        "nog": "Nogai",
+        "nor": "노르웨이어",
+        "nob": "Norwegian Bokmål",
+        "nno": "Norwegian Nynorsk",
+        "nym": "Nyamwezi",
+        "nya": "Nyanja",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Ossetian",
+        "pal": "Pahlavi",
+        "pau": "Palauan",
+        "pli": "Pali",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Panjabi",
+        "pap": "Papiamento",
+        "fas": "Persian",
+        "phn": " 페니키아 문자",
+        "pon": "Pohnpeian",
+        "pol": "폴란드어",
+        "por": "포르투갈어",
+        "pus": "Pashto",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "ron": "루마니아어",
+        "roh": "Romansh",
+        "rom": "Romany",
+        "run": "Rundi",
+        "rus": "러시아어",
+        "smo": "Samoan",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "san": "Sanskrit",
+        "sat": "Santali",
+        "srd": "Sardinian",
+        "sas": "Sasak",
+        "sco": "Scots",
+        "sel": "Selkup",
+        "srp": "세르비아어",
+        "srr": "Serer",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Sicilian",
+        "sid": "Sidamo",
+        "bla": "Siksika",
+        "snd": "Sindhi",
+        "sin": "싱할라 문자",
+        "den": "Slave (Athapascan)",
+        "slk": "슬로바키아어",
+        "slv": "슬로베니아어",
+        "sog": "Sogdian",
+        "som": "Somali",
+        "snk": "Soninke",
+        "spa": "스페인어",
+        "srn": "Sranan Tongo",
+        "suk": "Sukuma",
+        "sux": "Sumerian",
+        "sun": "Sundanese",
+        "sus": "Susu",
+        "swa": "Swahili (macrolanguage)",
+        "ssw": "Swati",
+        "swe": "스웨덴어",
+        "syr": "시리아 문자",
+        "tgl": "타갈로그 문자",
+        "tah": "Tahitian",
+        "tgk": "Tajik",
+        "tmh": "Tamashek",
+        "tam": "타밀 문자",
+        "tat": "Tatar",
+        "tel": "텔루구 문자",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tha": "태국어",
+        "bod": "티베트 문자",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tem": "Timne",
+        "tiv": "Tiv",
+        "tli": "Tlingit",
+        "tpi": "Tok Pisin",
+        "tkl": "Tokelau",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga Islands)",
+        "tsi": "Tsimshian",
+        "tso": "Tsonga",
+        "tsn": "Tswana",
+        "tum": "Tumbuka",
+        "tur": "터키어",
+        "tuk": "Turkmen",
+        "tvl": "Tuvalu",
+        "tyv": "Tuvinian",
+        "twi": "Twi",
+        "udm": "Udmurt",
+        "uga": "우가리트 문자",
+        "uig": "Uighur",
+        "ukr": "Ukrainian",
+        "umb": "Umbundu",
+        "mis": "Uncoded languages",
+        "und": "Undetermined",
+        "urd": "Urdu",
+        "uzb": "Uzbek",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "베트남어",
+        "vol": "Volapük",
+        "vot": "Votic",
+        "wln": "Walloon",
+        "war": "Waray (Philippines)",
+        "was": "Washo",
+        "cym": "Welsh",
+        "wal": "Wolaytta",
+        "wol": "Wolof",
+        "xho": "Xhosa",
+        "sah": "Yakut",
+        "yao": "Yao",
+        "yap": "Yapese",
+        "yid": "Yiddish",
+        "yor": "Yoruba",
+        "zap": "Zapotec",
+        "zza": "Zaza",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zul": "Zulu",
+        "zun": "Zuni"
+    },
     "nl": {
         "aar": "Afar; Hamitisch",
         "abk": "Abchazisch",
@@ -4230,6 +4627,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini; Edo",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetaans",
         "bos": "Bosnisch",
@@ -4338,6 +4736,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligainoons",
         "hin": "Hindi",
         "hit": "Hittitisch",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatisch",
@@ -4652,6 +5051,7 @@ LANGUAGE_NAMES = {
         "bik": "bikol",
         "bin": "edo",
         "bis": "bislama",
+        "bit": "Berinomo",
         "bla": "siksika",
         "bod": "tybetański",
         "bos": "bośniacki",
@@ -4760,6 +5160,7 @@ LANGUAGE_NAMES = {
         "hil": "hiligajnon",
         "hin": "hindi",
         "hit": "hetycki",
+        "hmj": "Ge",
         "hmn": "hmong",
         "hmo": "hiri motu",
         "hrv": "chorwacki",
@@ -5069,6 +5470,7 @@ LANGUAGE_NAMES = {
         "bel": "Belarusian",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -5143,6 +5545,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgiano",
         "deu": "Alemão",
@@ -5449,6 +5852,7 @@ LANGUAGE_NAMES = {
         "bik": "Бикольский",
         "bin": "Бини",
         "bis": "Бислама",
+        "bit": "Berinomo",
         "bla": "Сиксика",
         "bod": "Тибетский",
         "bos": "Боснийский",
@@ -5557,6 +5961,7 @@ LANGUAGE_NAMES = {
         "hil": "Хилигайнон",
         "hin": "Хинди",
         "hit": "Хиттит",
+        "hmj": "Ge",
         "hmn": "Хмонг",
         "hmo": "Хири Моту",
         "hrv": "Хорватский",
@@ -5871,6 +6276,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Edo (bini)",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika (svartfotindianernas språk)",
         "bod": "Tibetanska",
         "bos": "Bosniska",
@@ -5979,6 +6385,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hettitiska språk",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Kroatiska",
@@ -6288,6 +6695,7 @@ LANGUAGE_NAMES = {
         "bel": "Beyaz Rusça",
         "bem": "Bemba (Zambia)",
         "ben": "Bengalce",
+        "bit": "Berinomo",
         "bho": "Bhojpuri (Hindistan)",
         "bik": "Bikol (Filipinler)",
         "byn": "Bilin",
@@ -6362,6 +6770,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda Dili",
         "gay": "Gayo (Sumatra)",
         "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
+        "hmj": "Ge",
         "gez": "Geez (Etiyopya)",
         "kat": "Gürcüce",
         "deu": "Almanca",
@@ -6668,6 +7077,7 @@ LANGUAGE_NAMES = {
         "bik": "бікольська",
         "bin": "біні",
         "bis": "біслама",
+        "bit": "беріномо",
         "bla": "сісіка",
         "bod": "тибетська",
         "bos": "боснійська",
@@ -6776,6 +7186,7 @@ LANGUAGE_NAMES = {
         "hil": "хілігайнон",
         "hin": "хінді",
         "hit": "хетська",
+        "hmj": "ге",
         "hmn": "хмонг",
         "hmo": "хірімоту",
         "hrv": "хорватська",
@@ -7090,6 +7501,7 @@ LANGUAGE_NAMES = {
         "bik": "比科尔语",
         "bin": "比尼语",
         "bis": "比斯拉马语",
+        "bit": "Berinomo",
         "bla": "西克西卡语",
         "bod": "藏语",
         "bos": "波斯尼亚语",
@@ -7198,6 +7610,7 @@ LANGUAGE_NAMES = {
         "hil": "希利盖农语",
         "hin": "印地语",
         "hit": "赫梯语",
+        "hmj": "亻革家语、重安江苗语",
         "hmn": "苗语",
         "hmo": "希里莫图语",
         "hrv": "克罗地亚语",
@@ -7507,6 +7920,7 @@ LANGUAGE_NAMES = {
         "bel": "白俄羅斯文",
         "bem": "Bemba (Zambia)",
         "ben": "Bengali",
+        "bit": "Berinomo",
         "bho": "Bhojpuri",
         "bik": "Bikol",
         "byn": "Bilin",
@@ -7581,6 +7995,7 @@ LANGUAGE_NAMES = {
         "lug": "Ganda",
         "gay": "Gayo",
         "gba": "Gbaya (Central African Republic)",
+        "hmj": "Ge",
         "gez": "Geez",
         "kat": "Georgian",
         "deu": "德文",
@@ -7887,6 +8302,7 @@ LANGUAGE_NAMES = {
         "bik": "Bikol",
         "bin": "Bini",
         "bis": "Bislama",
+        "bit": "Berinomo",
         "bla": "Siksika",
         "bod": "Tibetan",
         "bos": "Bosnian",
@@ -7921,6 +8337,7 @@ LANGUAGE_NAMES = {
         "cre": "Cree",
         "crh": "Turkish; Crimean",
         "csb": "Kashubian",
+        "csl": "Chinese Sign Language",
         "cym": "Welsh",
         "dak": "Dakota",
         "dan": "Danish",
@@ -7995,6 +8412,7 @@ LANGUAGE_NAMES = {
         "hil": "Hiligaynon",
         "hin": "Hindi",
         "hit": "Hittite",
+        "hmj": "Ge",
         "hmn": "Hmong",
         "hmo": "Hiri Motu",
         "hrv": "Croatian",
diff --git a/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js
new file mode 100644
index 00000000..9751ee5c
--- /dev/null
+++ b/cps/static/js/libs/bootstrap-datepicker/locales/bootstrap-datepicker.ko.min.js
@@ -0,0 +1 @@
+!function(a){a.fn.datepicker.dates.ko={days:["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],daysShort:["일","월","화","수","목","금","토"],daysMin:["일","월","화","수","목","금","토"],months:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],monthsShort:["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],today:"오늘",clear:"삭제",format:"yyyy-mm-dd",titleFormat:"yyyy년mm월",weekStart:0}}(jQuery);
\ No newline at end of file
diff --git a/cps/static/js/libs/tinymce/langs/ko.js b/cps/static/js/libs/tinymce/langs/ko.js
new file mode 100644
index 00000000..c6b3f266
--- /dev/null
+++ b/cps/static/js/libs/tinymce/langs/ko.js
@@ -0,0 +1,261 @@
+tinymce.addI18n('ko_KR',{
+"Redo": "\ub2e4\uc2dc\uc2e4\ud589",
+"Undo": "\uc2e4\ud589\ucde8\uc18c",
+"Cut": "\uc798\ub77c\ub0b4\uae30",
+"Copy": "\ubcf5\uc0ac\ud558\uae30",
+"Paste": "\ubd99\uc5ec\ub123\uae30",
+"Select all": "\uc804\uccb4\uc120\ud0dd",
+"New document": "\uc0c8 \ubb38\uc11c",
+"Ok": "\ud655\uc778",
+"Cancel": "\ucde8\uc18c",
+"Visual aids": "\uc2dc\uac01\uad50\uc7ac",
+"Bold": "\uad75\uac8c",
+"Italic": "\uae30\uc6b8\uc784\uaf34",
+"Underline": "\ubc11\uc904",
+"Strikethrough": "\ucde8\uc18c\uc120",
+"Superscript": "\uc717\ucca8\uc790",
+"Subscript": "\uc544\ub798\ucca8\uc790",
+"Clear formatting": "\ud3ec\ub9f7\ucd08\uae30\ud654",
+"Align left": "\uc67c\ucabd\uc815\ub82c",
+"Align center": "\uac00\uc6b4\ub370\uc815\ub82c",
+"Align right": "\uc624\ub978\ucabd\uc815\ub82c",
+"Justify": "\uc591\ucabd\uc815\ub82c",
+"Bullet list": "\uc810\ub9ac\uc2a4\ud2b8",
+"Numbered list": "\uc22b\uc790\ub9ac\uc2a4\ud2b8",
+"Decrease indent": "\ub0b4\uc5b4\uc4f0\uae30",
+"Increase indent": "\ub4e4\uc5ec\uc4f0\uae30",
+"Close": "\ub2eb\uae30",
+"Formats": "\ud3ec\ub9f7",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc838\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc811\uadfc\uc744 \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Ctrl+X\/C\/V \ud0a4\ub97c \uc774\uc6a9\ud574 \uc8fc\uc138\uc694.",
+"Headers": "\uc2a4\ud0c0\uc77c",
+"Header 1": "\uc81c\ubaa9 1",
+"Header 2": "\uc81c\ubaa9 2",
+"Header 3": "\uc81c\ubaa9 3",
+"Header 4": "\uc81c\ubaa9 4",
+"Header 5": "\uc81c\ubaa9 5",
+"Header 6": "\uc81c\ubaa9 6",
+"Headings": "\uc81c\ubaa9",
+"Heading 1": "\uc81c\ubaa9 1",
+"Heading 2": "\uc81c\ubaa9 2",
+"Heading 3": "\uc81c\ubaa9 3",
+"Heading 4": "\uc81c\ubaa9 4",
+"Heading 5": "\uc81c\ubaa9 5",
+"Heading 6": "\uc81c\ubaa9 6",
+"Preformatted": "Preformatted",
+"Div": "\uad6c\ubd84",
+"Pre": "Pre",
+"Code": "\ucf54\ub4dc",
+"Paragraph": "\ub2e8\ub77d",
+"Blockquote": "\uad6c\ud68d",
+"Inline": "\ub77c\uc778 \uc124\uc815",
+"Blocks": "\ube14\ub85d \uc124\uc815",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\uc2a4\ud0c0\uc77c\ubcf5\uc0ac \ub044\uae30. \uc774 \uc635\uc158\uc744 \ub044\uae30 \uc804\uc5d0\ub294 \ubcf5\uc0ac \uc2dc, \uc2a4\ud0c0\uc77c\uc774 \ubcf5\uc0ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
+"Font Family": "\uae00\uaf34",
+"Font Sizes": "\ud3f0\ud2b8 \uc0ac\uc774\uc988",
+"Class": "\ud074\ub798\uc2a4",
+"Browse for an image": "\uc774\ubbf8\uc9c0 \ucc3e\uae30",
+"OR": "\ud639\uc740",
+"Drop an image here": "\uc774\ubbf8\uc9c0 \ub4dc\ub86d",
+"Upload": "\uc5c5\ub85c\ub4dc",
+"Block": "\ube14\ub85d",
+"Align": "\uc815\ub82c",
+"Default": "\uae30\ubcf8",
+"Circle": "\uc6d0",
+"Disc": "\uc6d0\ubc18",
+"Square": "\uc0ac\uac01",
+"Lower Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
+"Lower Greek": "\uadf8\ub9ac\uc2a4\uc5b4 \uc18c\ubb38\uc790",
+"Lower Roman": "\ub85c\ub9c8\uc790 \uc18c\ubb38\uc790",
+"Upper Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
+"Upper Roman": "\ub85c\ub9c8\uc790 \ub300\ubb38\uc790",
+"Anchor": "\uc575\ucee4",
+"Name": "\uc774\ub984",
+"Id": "\uc544\uc774\ub514",
+"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\uc544\uc774\ub514\ub294 \ubb38\uc790, \uc22b\uc790, \ub300\uc2dc, \uc810, \ucf5c\ub860 \ub610\ub294 \ubc11\uc904\ub85c \uc2dc\uc791\ud574\uc57c\ud569\ub2c8\ub2e4.",
+"You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ud558\uc9c0 \uc54a\uc740 \uc815\ubcf4\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \ud398\uc774\uc9c0\ub97c \ubc97\uc5b4\ub098\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+"Restore last draft": "\ub9c8\uc9c0\ub9c9 \ucd08\uc548 \ubcf5\uc6d0",
+"Special character": "\ud2b9\uc218\ubb38\uc790",
+"Source code": "\uc18c\uc2a4\ucf54\ub4dc",
+"Insert\/Edit code sample": "\ucf54\ub4dc\uc0d8\ud50c \uc0bd\uc785\/\ud3b8\uc9d1",
+"Language": "\uc5b8\uc5b4",
+"Code sample": "\ucf54\ub4dc\uc0d8\ud50c",
+"Color": "\uc0c9\uc0c1",
+"R": "R",
+"G": "G",
+"B": "B",
+"Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd",
+"Right to left": "\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd",
+"Emoticons": "\uc774\ubaa8\ud2f0\ucf58",
+"Document properties": "\ubb38\uc11c \uc18d\uc131",
+"Title": "\uc81c\ubaa9",
+"Keywords": "\ud0a4\uc6cc\ub4dc",
+"Description": "\uc124\uba85",
+"Robots": "\ub85c\ubd07",
+"Author": "\uc800\uc790",
+"Encoding": "\uc778\ucf54\ub529",
+"Fullscreen": "\uc804\uccb4\ud654\uba74",
+"Action": "\ub3d9\uc791",
+"Shortcut": "\ub2e8\ucd95\ud0a4",
+"Help": "\ub3c4\uc6c0\ub9d0",
+"Address": "\uc8fc\uc18c",
+"Focus to menubar": "\uba54\ub274\uc5d0 \ud3ec\ucee4\uc2a4",
+"Focus to toolbar": "\ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
+"Focus to element path": "element path\uc5d0 \ud3ec\ucee4\uc2a4",
+"Focus to contextual toolbar": "\ucf04\ud14d\uc2a4\ud2b8 \ud234\ubc14\uc5d0 \ud3ec\ucee4\uc2a4",
+"Insert link (if link plugin activated)": "\ub9c1\ud06c \uc0bd\uc785 (link \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
+"Save (if save plugin activated)": "\uc800\uc7a5 (save \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
+"Find (if searchreplace plugin activated)": "\ucc3e\uae30(searchreplace \ud50c\ub7ec\uadf8\uc778\uc774 \ud65c\uc131\ud654\ub41c \uc0c1\ud0dc\uc5d0\uc11c)",
+"Plugins installed ({0}):": "\uc124\uce58\ub41c \ud50c\ub7ec\uadf8\uc778 ({0}):",
+"Premium plugins:": "\uace0\uae09 \ud50c\ub7ec\uadf8\uc778",
+"Learn more...": "\uc880 \ub354 \uc0b4\ud3b4\ubcf4\uae30",
+"You are using {0}": "{0}\ub97c \uc0ac\uc6a9\uc911",
+"Plugins": "\ud50c\ub7ec\uadf8\uc778",
+"Handy Shortcuts": "\ub2e8\ucd95\ud0a4",
+"Horizontal line": "\uac00\ub85c",
+"Insert\/edit image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785\/\uc218\uc815",
+"Image description": "\uc774\ubbf8\uc9c0 \uc124\uba85",
+"Source": "\uc18c\uc2a4",
+"Dimensions": "\ud06c\uae30",
+"Constrain proportions": "\uc791\uc5c5 \uc81c\ud55c",
+"General": "\uc77c\ubc18",
+"Advanced": "\uace0\uae09",
+"Style": "\uc2a4\ud0c0\uc77c",
+"Vertical space": "\uc218\uc9c1 \uacf5\ubc31",
+"Horizontal space": "\uc218\ud3c9 \uacf5\ubc31",
+"Border": "\ud14c\ub450\ub9ac",
+"Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
+"Image": "\uc774\ubbf8\uc9c0",
+"Image list": "\uc774\ubbf8\uc9c0 \ubaa9\ub85d",
+"Rotate counterclockwise": "\uc2dc\uacc4\ubc18\ub300\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
+"Rotate clockwise": "\uc2dc\uacc4\ubc29\ud5a5\uc73c\ub85c \ud68c\uc804",
+"Flip vertically": "\uc218\uc9c1 \ub4a4\uc9d1\uae30",
+"Flip horizontally": "\uc218\ud3c9 \ub4a4\uc9d1\uae30",
+"Edit image": "\uc774\ubbf8\uc9c0 \ud3b8\uc9d1",
+"Image options": "\uc774\ubbf8\uc9c0 \uc635\uc158",
+"Zoom in": "\ud655\ub300",
+"Zoom out": "\ucd95\uc18c",
+"Crop": "\uc790\ub974\uae30",
+"Resize": "\ud06c\uae30 \uc870\uc808",
+"Orientation": "\ubc29\ud5a5",
+"Brightness": "\ubc1d\uae30",
+"Sharpen": "\uc120\uba85\ud558\uac8c",
+"Contrast": "\ub300\ube44",
+"Color levels": "\uc0c9\uc0c1\ub808\ubca8",
+"Gamma": "\uac10\ub9c8",
+"Invert": "\ubc18\uc804",
+"Apply": "\uc801\uc6a9",
+"Back": "\ub4a4\ub85c",
+"Insert date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04\uc0bd\uc785",
+"Date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04",
+"Insert link": "\ub9c1\ud06c \uc0bd\uc785 ",
+"Insert\/edit link": "\ub9c1\ud06c \uc0bd\uc785\/\uc218\uc815",
+"Text to display": "\ubcf8\ubb38",
+"Url": "\uc8fc\uc18c",
+"Target": "\ub300\uc0c1",
+"None": "\uc5c6\uc74c",
+"New window": "\uc0c8\ucc3d",
+"Remove link": "\ub9c1\ud06c\uc0ad\uc81c",
+"Anchors": "\ucc45\uac08\ud53c",
+"Link": "\ub9c1\ud06c",
+"Paste or type a link": "\ub9c1\ud06c\ub97c \ubd99\uc5ec\ub123\uac70\ub098 \uc785\ub825\ud558\uc138\uc694",
+"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\ud604\uc7ac E-mail\uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. E-mail \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
+"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\ud604\uc7ac \uc6f9\uc0ac\uc774\ud2b8 \uc8fc\uc18c\ub97c \uc785\ub825\ud558\uc168\uc2b5\ub2c8\ub2e4. \ud574\ub2f9 \uc8fc\uc18c\uc5d0 \ub9c1\ud06c\ub97c \uac78\uae4c\uc694?",
+"Link list": "\ub9c1\ud06c \ub9ac\uc2a4\ud2b8",
+"Insert video": "\ube44\ub514\uc624 \uc0bd\uc785",
+"Insert\/edit video": "\ube44\ub514\uc624 \uc0bd\uc785\/\uc218\uc815",
+"Insert\/edit media": "\ubbf8\ub514\uc5b4 \uc0bd\uc785\/\uc218\uc815",
+"Alternative source": "\ub300\uccb4 \uc18c\uc2a4",
+"Poster": "\ud3ec\uc2a4\ud130",
+"Paste your embed code below:": "\uc544\ub798\uc5d0 \ucf54\ub4dc\ub97c \ubd99\uc5ec\ub123\uc73c\uc138\uc694:",
+"Embed": "\uc0bd\uc785",
+"Media": "\ubbf8\ub514\uc5b4",
+"Nonbreaking space": "\ub744\uc5b4\uc4f0\uae30",
+"Page break": "\ud398\uc774\uc9c0 \uad6c\ubd84\uc790",
+"Paste as text": "\ud14d\uc2a4\ud2b8\ub85c \ubd99\uc5ec\ub123\uae30",
+"Preview": "\ubbf8\ub9ac\ubcf4\uae30",
+"Print": "\ucd9c\ub825",
+"Save": "\uc800\uc7a5",
+"Find": "\ucc3e\uae30",
+"Replace with": "\uad50\uccb4",
+"Replace": "\uad50\uccb4",
+"Replace all": "\uc804\uccb4 \uad50\uccb4",
+"Prev": "\uc774\uc804",
+"Next": "\ub2e4\uc74c",
+"Find and replace": "\ucc3e\uc544\uc11c \uad50\uccb4",
+"Could not find the specified string.": "\ubb38\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
+"Match case": "\ub300\uc18c\ubb38\uc790 \uc77c\uce58",
+"Whole words": "\uc804\uccb4 \ub2e8\uc5b4",
+"Spellcheck": "\ubb38\ubc95\uccb4\ud06c",
+"Ignore": "\ubb34\uc2dc",
+"Ignore all": "\uc804\uccb4\ubb34\uc2dc",
+"Finish": "\uc644\ub8cc",
+"Add to Dictionary": "\uc0ac\uc804\uc5d0 \ucd94\uac00",
+"Insert table": "\ud14c\uc774\ube14 \uc0bd\uc785",
+"Table properties": "\ud14c\uc774\ube14 \uc18d\uc131",
+"Delete table": "\ud14c\uc774\ube14 \uc0ad\uc81c",
+"Cell": "\uc140",
+"Row": "\uc5f4",
+"Column": "\ud589",
+"Cell properties": "\uc140 \uc18d",
+"Merge cells": "\uc140 \ud569\uce58\uae30",
+"Split cell": "\uc140 \ub098\ub204\uae30",
+"Insert row before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
+"Insert row after": "\ub2e4\uc74c\uc5d0 \ud589 \uc0bd\uc785",
+"Delete row": "\ud589 \uc9c0\uc6b0\uae30",
+"Row properties": "\ud589 \uc18d\uc131",
+"Cut row": "\ud589 \uc798\ub77c\ub0b4\uae30",
+"Copy row": "\ud589 \ubcf5\uc0ac",
+"Paste row before": "\uc774\uc804\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
+"Paste row after": "\ub2e4\uc74c\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
+"Insert column before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
+"Insert column after": "\ub2e4\uc74c\uc5d0 \uc5f4 \uc0bd\uc785",
+"Delete column": "\uc5f4 \uc9c0\uc6b0\uae30",
+"Cols": "\uc5f4",
+"Rows": "\ud589",
+"Width": "\ub113\uc774",
+"Height": "\ub192\uc774",
+"Cell spacing": "\uc140 \uac04\uaca9",
+"Cell padding": "\uc140 \uc548\ucabd \uc5ec\ubc31",
+"Caption": "\ucea1\uc158",
+"Left": "\uc67c\ucabd",
+"Center": "\uac00\uc6b4\ub370",
+"Right": "\uc624\ub978\ucabd",
+"Cell type": "\uc140 \ud0c0\uc785",
+"Scope": "\ubc94\uc704",
+"Alignment": "\uc815\ub82c",
+"H Align": "\uac00\ub85c \uc815\ub82c",
+"V Align": "\uc138\ub85c \uc815\ub82c",
+"Top": "\uc0c1\ub2e8",
+"Middle": "\uc911\uac04",
+"Bottom": "\ud558\ub2e8",
+"Header cell": "\ud5e4\ub354 \uc140",
+"Row group": "\ud589 \uadf8\ub8f9",
+"Column group": "\uc5f4 \uadf8\ub8f9",
+"Row type": "\ud589 \ud0c0\uc785",
+"Header": "\ud5e4\ub354",
+"Body": "\ubc14\ub514",
+"Footer": "\ud478\ud130",
+"Border color": "\ud14c\ub450\ub9ac \uc0c9",
+"Insert template": "\ud15c\ud50c\ub9bf \uc0bd\uc785",
+"Templates": "\ud15c\ud50c\ub9bf",
+"Template": "\ud15c\ud50c\ub9bf",
+"Text color": "\ubb38\uc790 \uc0c9\uae54",
+"Background color": "\ubc30\uacbd\uc0c9",
+"Custom...": "\uc9c1\uc811 \uc0c9\uae54 \uc9c0\uc815\ud558\uae30",
+"Custom color": "\uc9c1\uc811 \uc9c0\uc815\ud55c \uc0c9\uae54",
+"No color": "\uc0c9\uc0c1 \uc5c6\uc74c",
+"Table of Contents": "\ubaa9\ucc28",
+"Show blocks": "\ube14\ub7ed \ubcf4\uc5ec\uc8fc\uae30",
+"Show invisible characters": "\uc548\ubcf4\uc774\ub294 \ubb38\uc790 \ubcf4\uc774\uae30",
+"Words: {0}": "\ub2e8\uc5b4: {0}",
+"{0} words": "{0} \ub2e8\uc5b4",
+"File": "\ud30c\uc77c",
+"Edit": "\uc218\uc815",
+"Insert": "\uc0bd\uc785",
+"View": "\ubcf4\uae30",
+"Format": "\ud3ec\ub9f7",
+"Table": "\ud14c\uc774\ube14",
+"Tools": "\ub3c4\uad6c",
+"Powered by {0}": "Powered by {0}",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30 \uc785\ub2c8\ub2e4. ALT-F9\ub97c \ub204\ub974\uba74 \uba54\ub274, ALT-F10\ub97c \ub204\ub974\uba74 \ud234\ubc14, ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4."
+});
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index 3733c6c4e23a2c3ed78a08e9ba5ea3edb538486a..a411e0e77b9bbc20258458b3187b7e89aaaeb56a 100644
GIT binary patch
delta 8959
zcmYM(2~?L=8prWh6xoy=L_|ac1zAKyk#Nh65HQVM(L@=|6m!d5(ATwcNla4HGBdR@
z({su)Y{51y!_0EcC9{r}Gp01*l2*?5$GzuF$MJLTeeZjh=RWuSPcwJk@!0T=hx<ct
zy|oViwDNGAC>$81+W-Gq8S6N0sXl|rxF6N;Dh8uZ3saB680uN*jl*#ej>W;a53?{Z
z&T%?oAM|t_*I7)VD-Fxg3lCvk{1zMG32cSGp)ZETJB~lbU;}J}q1Xx4ufJ`djq3NL
zt*=E->aU>2dA(NGarRJ9$4U&quTcv)kDhoDwUA#>JHChN7u?be6pM;T3KA5j4>rUS
zRR6iy1Xp1szJcj@0DYL>xlKVGJy^a%7lv9;G-_uln1tQ2IZj4Rv>J6JdoT=t#Kw3N
z>tkR7|G`G+g$byQq+vaL0NoG@1-79G71D7SgVRw1K8Fg~Ze(m{A8J7tF%26gnuT=1
z`>0RE4)`i6g6A;>e@6Z|L9NY#vs-iiLulwvgI2Z!6{1gU{TylmHP{sWnN`n|QT=ml
z{b5wZ=Ad@I%(kyaMQkUsR_AL}e&4k1-pRyY6SO9d8n7o8VIgXuN+fZe1L%uaPz$I*
z9a#X|%EDOGM1`o3&qqyEhWFzZ<Q3;<R73((O^$@S6f$UtL%lc*b=@At2KXW>2X<gX
ztVBONj6Lu)>PVv6n4IW|O2+Z11unr(xE?j$arDQFs0F&!6f~d*2N{6=sOuPw?Qj$-
zN7kT{=2dKlJ5iCS!f3pVN=i>wugE2!#%*KGMvb3?K{y0C64#kPK?AKpO|T2~;@hYd
zSE91F3VrYxdgFQ2kzGcG_8;4x#NE<(8L0jbqWTR(MQkc60`Fot^E;nY(2mZcc5)YW
zmXT~<3+jXsct7eM4@VuvOw_eog2A{EwcuSCgzuwr>o5l5Wz_h$Pzwy_-2Iu~X-h%L
z)eW`cJk$$=P{}e5wS!5>A7=@Fh2uW#f=4kF1KOJpOB`xJLr@EO6t&}0)B;zaZqxJV
zYT~^V)bSJ4*&RbA)fpsV9S<%ui+0jbkt)WPxWu{>HQ;yFYSd2sGYLPYU>MHB0xZYc
zB+MlKny8wFaE#!WK@+yYUN{otaVs{$L#Q2GL@oFl@@c5OgUX2{?xKz?1GTX%)ObBn
z5uJw0t;N_7%d&{SCf-DYuFX5B1$~Q};7?R&{q8eoAA<v^cS7}Bjhd(e6}it)6MThQ
z$VvPBEb3@4qjIPkbsHME*=A)?s25XE6K7#A=AkB7YujH&MdEFY!>>?heH{sg<H2S3
z!fe!gJx~+%#U?n)ItN3jyXz=KQFsH@@e7Q=Q?_1h>rQ8rT#Zp*w0zW;aTO}GZ=>G(
z47I>>*cNNB8@41<bwuM)8=QhH+;tXFP-xbo&SbNB;Os(W|Hr6M9>hefLha-RYM`L5
zW~VKXxtvra7|tY&!q-s?JAj(!2h@@Oieb9{_b4cIVckqt_C-xR65HTdR4B_)XZ#ZC
z`>-9g(=Sj-c>$HxSFthP#ikfWxO61#Q154B5_ZRW%<oL5pp{KWb)1JDxD>U3r%@rU
zz}9#O)363(Fups3VQ>B-ubgEVjh~|;_cLl?zoG};LgmgKbajT!_%2d*dSEI(i4Wns
zsC)0-(<Eaj9IWS9`w7Mv>X)rvy-Z{hP!smSbR34P)me#J_z~2#yw{8PYo#f@O+!BF
zZ08_<oOS%A9i7KajL0!N>W5muAXLtbLM87cYpH#{660uJi^}%*QAc$I74fq<#9u4D
zWINQLlFIu56Y@w@Jqh(fXVgGBsGJyq8gLxe$LXl=#T;vyeZI~57AhGl(F;$x_Q3_L
zN5fUrz`vt*^cQNt2D#=(qdBVH30q))^v1_+`+SU~UXCqsH@3nPs7U;c`p(4mF$;E6
zDKLlA9@)GzA2snoR2H8^?YJ7X;(B>@L8zTKM@29d)xR^U{}5C}CZdjLnyoKDKk82*
z@4HSp1?}KvRL33Yi|^U`r|3idDAvU@n1w%}aw8(&ENlR3oDrx<7NZt40X=asYW!uW
z4X&@1^M8$kcJLl*#RqNuYivOM9O}g@*cxx4vO2cFgnAIhQlEmFupBksF4X=15H;=@
z)J86%K0yD$Al-kDz9yuh=tn&fbyn?BI~tA(=~&bU=Lu^WDmh<69nC&l{{;2kG1Nro
z&>#Om_4jztT-#7|l}zm^Xo5bd-|11PiDsa#<4Rk99hJQwqXzmOYj=Vg$D^NVZ-g2r
z5w)SNs0HPrA~Dc9q95nqj)pO|VI69vn^0%=CMp-+M(yw;TR(sr=qLu@DQu3vU_AQt
zH@VUVl?&~x9Z}<UMlGyIf8rlV;XxYsJ#j|c4x5o*CucjRVFhZTS5Rl)^dXZA{ZJpU
zx!4vrq84x%HPL@D2ya_`2bcv%S(9A~T0ke;P=K0nBx=X2P!U;YpKnL){9V*N{}7dA
zr?B={5tXz-1I<xIqxxr}#_3`$z;x<vA%z4AWvGr7sGrUK*bvWQEBrU|#|a)}CK!)e
z;0#m_l%o2VqjtOnl|y?_Szm=(;0e@`{BEAR&P`Kr{0EyCT4L==QAtyP3guwbgoU=f
z7&TD|Do0!l#^tC9H(?^ahI;Q?)HvUxB6k7n>i7Q+1x4T=Y>BOgn1TADc2tC+_!#QL
zv&6Pnq9!_wTJTBRehC%HKTt<|2le6d8*1hWz)$P&-#IW%_y6uN^KUT8!%gUip|X0W
ztv`wS9&ANr?Uy(fk7E&b9ASPPH)4D0-=X?>7ZNQD<u5I0Dk>7QP)WJ~-HsGqrJxBf
zU^rgKNUT57e9@Yt`emcqXP_o1Lmj~jsH5728fUL<KZu&}G&aH?QD=YKw*Nhn_$#!Y
zqs#{*5<{q`p$6)Sy4M3ypV*nG{u@xA+T9p~U!u<X3MOI5!{%tZq9)Eo-HIYqj!Z^v
zbm7CUxo*$XpzJ(^df^gg;NP~MKH4m>4=Ra9qjo+HYeR}!&;r!+ji?D;#@Zh<)W$wV
zZRjK_lDAz7T3JYu*+C2{8T()xoQ|2e6?5?{=3)F8GtpE`rv3yf0^3j%AHm1*5;nyV
zBuq5U#%B0D#-Lk4K@)zD&C#RSyby=#*d4XgF{qu)KplaLx-HLHKS1^S$<}L75oz)-
zGhTa~OML(;V&5R+yUr;JJ~Z6ID6BKigen?ysHbBb&cO)Wj5?|c?2E@yN7Z7yNy4G1
z<SfFrSb|#EW^9LVp>pdIM(F<Epr9l0f5hDPCdgORNkm0v9>(LVs0bZKMc^8yV%-TQ
zsnSvRy_c;I#xUv=Y`cs4<gUj1@H32Ne&-(w^|9%r=2IJo+F?E_n;*eMd=AyG61Ct1
zsD9s}CccKs?t7@62TwE$?up*i$Dt=ah8pK_biF8)+6PNe_2sCuTZ0Pyo2UW4MMdBY
z`r=>qxz{A~uj|REfv2I~n~h4kmr#-V2wUJ)^ufRq;;#;oCFa^?p?1<AQ*aDwhpSPa
z*f&wv^8-|J9z$KDKQI~nCz~9~Mjg>mY=9-Gap$0J#|l&=UYSh%HQ?(s^umu(Nml<c
zK0eqCHBd1sq_a^W-iZNNX+45UvL8?jsz&Y5Z;Gjhp(2}xI{S{+=`Mx)Y1ob0Q8nsQ
z8#vXNi!G@yvhG0T!cioO&K=Z;W&AYrt)Gj5)K8=OT|sRyWV)Fr3A3q}pd#k(prC7a
z5`*v$)Bv6{%#TSp>a6q84~JkVj>XP63xjblYR89A;~YbMcrKxGsV-lmRBVc&n2$u-
zb&4ox0dtVw1!p~~;|<iraWhTm+F(QKnW(etg?gT6+XrJT^<oUer%*?^2?KC1>SzvP
z5ne<;-Txj>m=!&UdZ8E<@_877+b|C+P?4!O%M2K1jYsusk6J*kZJ&fX(o$4JUPMJ=
zH>&@a*o66=a}+Z1Hul4`+2(8(q9)vp5x5@}($m-#Z{kqwFvmos4ApNf*1m_jj{8xO
zJBXV2IO;n8imuM=cM2WwF6w@!&o$R>Fe-G@@Bv(8twJp%wA6eV(@_%)MSUN}VIzDR
z`{K*k7_Xyp$Y-9p1!41uzmlgP4Z5deF#)HbJ|G)VFIHj`JdOHZ)Swm`GT-bZ)7lN&
z(VmOCZu3ydw$#=)q6hU?um^6RPyCxwxI#mF^rGGoJ7WsY#2nm)x~5lA3rk&KCLVwa
zbs=it5>)O?!7jKS3-Bbi#khs$e_0ufiuewf!XOGiVlj4DWX|#h)cxIp+G!PP;_Ij#
zg)TP9m59ojTuj4_sQ0Qc3U8n`6uiV7NggWK#$s=DU!c&9!cSNaTP!talz=*#4Ag`<
zs4Ol-CC_BkL{He~TTqeMi#p0L&>xSZ-uu~l1C;|_Pu4znoe&B>G{mB^Ga1#P8!Gwo
zQTMzMmEGg53s4K&fZ@0swc`V*{y(86{>|3!*}Csj=KBzZwZH%A6yoWahs|*+DrDuT
zg&anGP)=hcUPI-E&(r3bW@0Pq#i$*xL~ZB=9Dv&~AOA!xwD&S|q$9B@`Q$95pouo4
zR=g86&_}lYFve0pjnQ})y)bgQxpuLrdK&7zj;P4xppIk+>UutcittSI#pPIg|JPEe
zOT%V-2)CkEd=oWrj}_+3^HBAHn2Lqyiz_e&*P(9Hd#Ht;u-0IG>LDvlPDP@=4=F3T
z{|ap{8kChIusfDx9G=8<yo<X3sn3`l^+82s1Zv><=z~j9--|L-BzK^a_yhFABbb6`
zPz(27Mf}w<WR*GFc+^DQP%jpuCU^`r@Jwuot5Lb|66#F%p_20`>Ka}_EikgojMo{p
z<6)@xrdn6J_Q7kYiT9%hI&14S*n)cCYSW%!EkI2?4s|5+P&-_Tp7<;(a_do%`3kks
z<M#Pw45aQ}rJzv!ZS{WEd<Q~M9U@RWNyH?~N9D>a^u|)ugiBG8T7f~h29<2vFb6A8
z{hT!>IqM?}be(VtU1`t7R9uG1Sb;jLOSV0v-0Y}3YNE$67)#L~%P;_6LLJp^)V2N+
z6`5<8g?CU9$#_ohasFK>XrKaAC`Y5R_Yu_2pTZb?14FP1btD(C0oGk>z7K&IO1&i(
zU^ZssGSq|zFb2OtEwmalb^o1p=G)&9^<Wcf;9VGl@1quY7Q^uxDn~rmo1I5vGwLa*
zi3(6(!Xc;)%s_2uJ!%7cQ4#qHT@_AJ(AoTi3hl3`WW0`=*zb9hz0s(Jb--5G0~N7}
zs9czi30R8Ck?p7>+<}RB3L9aa4QAnuH}HQCYDWn)C<nS?ZC2V2t5MH4qe8nEwZke@
zzZ0m1Uq<E3)eU<##>OV^`LS;u--hWaX>C)|I>fZixG$~Uo@+xp)v1%UCu#V^j6I*N
Hde85FAM0j&

delta 9045
zcmYM(3w+P@9>?)tYqQzi%x2j9ja|)b6Pq#QHVbpV<UTeULu?V^N9w30R+(E)NaQ$?
z&eTDNa}IUHsYz~0>&Q8&Gn2+SN=L_ez4!e-9;b&qzu)ig`}<x#-_Q3qYSRI)pAUGs
zUxj&BI{cI9<v6WyLKD^g|Ie0K$4RI9YfQn@sDAe_45QkbdJ1}|=b<0Y#8Fs^qwyqm
zMNd1&$-;5y<2bJK3Wc6DY(ihWgb(7^7>VCt0{(*j7#HU_!I*}D*b~EX5UO8+ZGRrs
zZ@sPWL?7zELydE=LDzAPQ&7ih48a=I0&buW)}t2kBWlMX@upuaYM=~ML~@XzIO8w~
zm!kT=fGzPgY=MU{1J7e)=6C#9wmOEPLKlZxP%3I?IoKYDV;fwCnrIv9NRDGO`~jn|
zQ6m4M2SYIdeK8BQkzVMHW6^C&VWMrAhYINe^x#U=fN!97dK8(%If+_OJ*HuFl37ST
zW>a5+UGP0r1aDvmyp8;F+9aC=4@~C#$IwtfgI0D36{0h?UWZzMH?u`!4C;AzRR1xy
zJ{J|Sa@5W@+4gOyh`o=j)u}<{cO$~4_U0+XUlU~0paDl>0hXW!szwsmIgkE$7qtLy
zwxc6!ja@MVHDC!U<ZDn9ZN-Q29pqK#HYy^XRFfm|E`^6^cnI}kG3vT4#z1@vl>>(`
z2&*vwzr;TH9qLF@I+~mqiAu(Ws0FUW?)WBZynkRY)}t2a>Hsxh7=~aB>N=)kC!B-I
zk=Id4^B%Uw_fe6!j4^lzm6Xj`y&{)|8n>r)AZq+E*aT-FN8&n*C}^P9Q4<_Ny?6|@
z;%Zd(UdG1wcl5&>s3W_B3T-fVO6}cH<Ml=LpN#5PjEdL_R0KZ62<CUrQP7UAqjnO&
zwsn@ts09te<~R&>k7uHe;#a6^w+_Q_4{E_junC?*<<^%Nig!@s`*Pk|U_1shzw<B!
zCD%~YipQf~C_*L60@MzkLVh{x_$>lYVh_B6;n=#f`LH~MTF?yCLKdTTyc)H@S5dcV
zH@cemFBH`A4C?Iuj!LRpBw?K}E;EaFdZ8j!hVi)0`aWvFt5zq|>@)_4(4K?M@I@Sq
zJFp=MGl{<@(ocj4NJLH86Z_$8jKeC7#7n3h)T0*sU*r?vgmMQP&K`ASeNh|BLyb2Q
z715_rx%CPL;nuFiUlZ@8LD%L3)PlZ7P0%>ogtjH>?9*@r4np<YhMMRjROHU0Cinui
zkZbn&b=1+`L5<^dGq<6YOF=73LA{uRnm7;ha6D>)owj{HDiX)A9e#m2>-$JBoG>oC
zFAhY#Hv)C-CSgmQV=c#~)ZJYaT2VNR>Ua^G<F~f%<d}LWazUIV)E8|6>dW{VY6Hhm
z@0~?0unyDFn+)xRT~J4~5VgVO$iiLcWeN(-PSlyaZ5}vBP}%<}DwG#62`{5|;?vU%
z)CRTFPRN{24<s1QQ>cv{L@n$*YM$>=NB$Ew)BO+WWkMH+%F0QoiDzR+EJaPQ19isx
zP~V4lQ9HeeO3It4_wQj81`wubj6)qsAJqE;u{{n)Z{~NFQP9d(qB_2aURa4*z(!Pv
zKf+|ZglXvA+x(dBjQny&^Bei)Y{D2khl<>7)WUv3FZAUzsNC^KS7+Ff0?(Wgn2PIh
zIDUw__s#p7WE_N}^&A^M!RVoW#~R6<Z9_c^HQ_i^&J-hScDA4v{uOq>kp9G9E6wR|
z8YZC5wjBB8?BX}==mutDVy@ZI6x0HWP&qRPmAp?`SKH@XupR9?QQ3Y9byQ!WB7QxW
z_-m#AwjI0&n51fs3VE`vcSF4}7&XusR8Gu74Y&Xs;Y!q}xZJwcK0jdnGb$OY(HFmU
z?Sq@>O~XCZzz^h^9R;EWY=tc_-PQ+TTj~YqhtJyfHK=|&FdmO$0)B&vM9?GVJClK0
zu-k(Ib2|NyAUJDKp}c^~;%lfKI|I#%!?9sOsGX;yBG?1fe=w^54AcZmP)GE%tyf?G
z^$p1TuCs%JcCa7S@eums30waR8&ki64`MCyb#}f-<woKlv#@EXab}?+S%zBBBJ{ym
zP~&exZSc(oIse~N&<;+ZR(!$MYcP;{9qPrqn2f%IO;%^1LS2NhxEwX%4%B!@Q1}01
z)VQ^%jntz)K>xuey8mJMCZz2!fO=QdS@lEhXeKJ8rKk_iD(hBM4*VYVNxh6psvEZc
zZ`Av~L(GJs7)(6@)xQh69tr~}=uC@I6D>piynY!q;cnEm{FAMJiOS-Cp#};XY9?rn
z8m9}YeIRO_iKva0q88+$BJ$i&&R>PKG<3rC_Q5ICO3$Fq?g}a=uAz2VZ|iqa?|Tn3
zXBvR|0JX$8%t7VMG*nK^u$G|4oi~j5Yh?>*2*s7y1J~IOXOW*$&LvF4I@Cg=`8?{&
zHVl;$&!9eJZ(}-EqZXh)ENG&5Y=SA)9vDJ>sA~&TPz!k6)>oh=d<nJVW2lInvd=G}
zcK%OP68?Znwt$i5sFG00+YfbA!%_Wbp~jhSbyrZxprHa2@i?ku9qPyDZ4AQDQRYJu
zgETq)Q4_q1THtO}R_{mkKY`luc~lO4i^~4{s9b8y4-$^Vb>b+fL$bBEbsRRV6qPh9
zP@ybGO;};uH=-umj>?fL48x<S3C~~>UPis=GscV)ge{ogX-Yv!l8TBz2FBxf)Id+8
zc2tSsxC8Y8I%wN(p(b+1ng#o#`bVK6nSeUlRMb2@QS<b{W9|d|rICWpy5l(WH<>A@
z(7%XEl0CM581-Gah)UXfI1T;A+rPA8CiQCUjEyFke%+B@&H#SXf_9=J@fNzu(gPH-
z@C($0O(&YOY>O?ZXQRGsqfq_k+V<V3g&ap6!D-Y{eT^EY*0%qQnlNyZIqGoKbxfH=
z{PiH628FgOHp6^uiiN0wo<!a2=TM*8J*fVlpcZx&J$Mgw*3pyAAF*;#M^lQCxD=JN
zm8heAeX?tI`YsJRf{#(z`3vfWs43>JT<NI#bkqWup^|YOYUi7=A*84U9Y8&=#t1xz
zO3v%3jom?Q$lon6Ax=T9EElzdk*FkDh8^)u%*2bBhapoNej+=Mq9)pjDfnB|`=6sG
z_98)^z$lEywHSkYu{F9MQ}9rzLroY|Xjaw*^}<+G#|5aJu1D=;H|hwgP`BkH>rGU@
zh$7RTh>FM%)Of|X1Xm#ubDamLn+XC?XVo5CVP{mRhGQ;H$9A|6o8wv3QPp8S`pqy$
zH3pT0t5L~WiRri<wXn0;3BSP*-T$b^%z#O#Bj}B~ze8{YPQ*lf2jlPyY=cg*i9jr-
zQq4pq)pXQ-Uu5g$sGRw=ZLh)%>K|Y>^E*FM(3xb+H1~5DCQu)X+Tn6+k6SPaKf*?M
z3$@_8sD6!RnTcaj3+aT~d4JS`pF}_0j6S#nT@Cab3ck4CJ~(LWM^R_@7gXr4pa$?M
zF#`spKlL=!^KRG=r=Z5&W!v|nHuxDTQuWvtJ+p~_V+ws|n-2LHNqsgdgwJ9JT#wq}
z2dJM3S5W<KqLR~hj=4n%m_ofbDu?Exl5{l&;&#-y`%t&zk8_B>LUDlx4frK$2meAP
zS@v8Oha*q}ZA681FDk@;!w|e>^?KYSSs3ce*$%bAp0=KcigY1nV~J}EZ{ou=Tt)4u
z-8}QD?Q30%@wC5ZtwH62_k0GyRMc&G75R!gZ(}G1mYROis14?#=9!G$(A`c!A*(@!
z%)iX+AOST%SL}?Bpw4<Z2H*=AjvFus-@-7gMeX<(Y=XXgeRS`mP`Q+esW=S7b^n)B
zP^c?W3)qJf@vo?kNej%xV^N`-hCw(Bb##mDbJw<)V=V0(u^GOP8vhLHsA^G1^D`Fc
z{x@4_cC-*#k+Tx@!bVic-@&H%IS#}+RAjQAGy~>YA4T;mMlE2eZQq7E(*3B2e2R+1
zRcy-q&OHjs?$AZ%8=rzhsTZP-=3Uf;SFt(XMujwRF^PrAI2LE3B61wn?<6+7hq{ip
zQIY!@wNSq$#9#Nh6$PDH9CpEusQWn`TVgpXbh~f>zGuCUTF8K>%$IRGYJ%0M56)(c
z#6Ms@p2H|?yVOKHXDRW|rXi08CC@Xcd%6J=@eS06<rCD4x3DD!E;HYYMASlaQ5%_M
zEyGUKm!fj!9n{etvh`~8qJCi+@$W<75)IK9O}#UA!z`SK9dHlk;^(OA<5_MNHWfAT
zDpaT|Py=sA<<1+}1OJMH(SL>cevHN8)XQB83V98V!tkd#cbthj%hRZPejc^c`>2St
zU1@eS09#X^h{~Czn1<D;_wHjWOnSy_s6XmRT+EakDD<ar8hc^Hv*yocV^H^e0_tcU
zLxpe&DvK*nJAWND(QobZ^QcJFqK@)E7>s_uGVeuNlaTRUryB)z$VDaLXjFDiF&&&T
zRPrrHeSj)Z+5M{Z0BT{MU<6)8?f5RLf5a*?aT`><ldbo_hX4LIl!6AFj&bN>8{CP?
zffJ}mIM106N+7nN8jH$}9Mm<Pg$cM3wV^+uHgp<C;3XV{9iBG}U5stXC+8&!O1^hd
z6P-nc_;09z>TSDIZayr57(;tU^u>JCwHs~gg{b#RP?1}LI+7Pq{kEVYyayZp`~Oi2
zjcGWE58_!=c3woSIQa!L(L(g2?%Mium`c3@{qc|J!BeOWT}Lgn@oIZru@UuLR8Hlu
z=KPh71vKbey$F?+Yq2+;z;@{WqWL3JN7VhFirUdKjK#I6fq#eE$RX7C;y5ajHK+-1
zVgP!rF-I4?hWKmc-DyzAT-4b<ikhelQ?LRxz!B6$pQ0wXh(TD7dhb3e30tf+IhBsO
zj*p-gx&$@uYp9JMb}8t^&#X7>1HTH>(Su6P?zTP(+ftur+bga6P!pd(<-}L0onAv9
zyoDL~6DmUOUosnZJ5x}HTnxp*sEACm7Na-yGW&cHYA5B`9`~Yh<`OD5YEa`{Lq)0%
zo8WC!()qm1To{G)bDaVTAvDau3|xpkaSx_qE$RrOUNL9ZAJtxl>c0au(FF{{8VtrC
zP~+Z59aYFWbG?&Lkr{$rnco>tK_RI`y|@)M&^}Zs|BTAwlc=44haL>5G&@Q`9Z4??
z#6oO_^DrD&;b7c?-LMulU;KK;(fv=Opp_0oWq$z{;wIbvU(~?C8_dKlQ48#j5jX@J
zK47Q~xY!!kpeEXf`XU}gZQwj=LqB1||NoENXhPE7nu$8YKB&;<p|W-;YT^=%L>INN
z4VZv$pd$7$Di_XSBG#aCq|qjGg#MUBJ!_LQxnZEGG-&0EQ9F7bl>^&QNqNOSueZ;g
z%_g*ws2!%D`gOsEWJcx8;LTO#v9T#Jo`uCFC7!88p2DJ%qOzhw&-A(TJq0v9QCc*=
zv}#wruYXW_hxCjN85y4RuGwi_st%9s{=frSRX;vD>!Enh)F%pyJf*V>79Za}r@-_0
g{JEY5A8s$2_Sl?7o+my$TD+j3jA5(BuQ?j<KRn-i(EtDd

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index 581af829..fd74006e 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-06-09 21:11+0100\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "není nainstalováno"
 msgid "installed"
 msgstr "nainstalováno"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistika"
 
@@ -45,9 +45,9 @@ msgstr "Úspěšně obnovené připojení"
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Neznámý"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Database Configuration"
 msgstr "Konfigurace funkcí"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
@@ -357,7 +357,7 @@ msgstr "Upravit uživatele %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
@@ -392,7 +392,7 @@ msgstr "Nastavení e-mailového serveru aktualizováno"
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
@@ -492,108 +492,112 @@ msgstr "není nakonfigurováno"
 msgid "Execution permissions missing"
 msgstr "Chybí povolení k exekuci"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Formát knihy úspěšně smazán"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Jejda! Vybraná kniha není k dispozici. Soubor neexistuje nebo není přístupný"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "upravit metadata"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s není platným jazykem"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Soubor s příponou '%(ext)s' nelze odeslat na tento server"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Soubor, který má být odeslán musí mít příponu"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nepodařilo se vytvořit cestu %(path)s (oprávnění odepřeno)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Formát souboru %(ext)s přidán do %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Chyba při úpravách knihy, zkontrolujte prosím log pro podrobnosti"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Nahraná kniha pravděpodobně existuje v knihovně, zvažte prosím změnu před nahráním nové: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Soubor %(filename)s nemohl být uložen do dočasného adresáře"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Nepodařilo se přesunout soubor obalu %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kniha byla úspěšně zařazena do fronty pro převod do %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Při převodu této knihy došlo k chybě: %(res)s"
@@ -606,175 +610,175 @@ msgstr "Google Drive nastavení nebylo dokončeno, zkuste  znovu deaktivovat a a
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Doména zpětného volání není ověřena, postupujte podle pokynů k ověření domény v konzole pro vývojáře google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formát pro knihu: %(book)d nenalezen"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s nenalezen na Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nenalezen: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Poslat do Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Tento e-mail byl odeslán přes Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web zkušební e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Zkušební e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Začínáme s Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrační e-mail pro uživatele: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Převést %(orig)s do %(format)s a poslat do Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Poslat %(format)s do Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Poslat do Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Požadovaný soubor nelze přečíst. Možná nesprávná oprávnění?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Mazání knihy selhalo %(id)s failed: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Mazání knihy %(id)s, cesta ke knize není platná %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Přejmenování názvu z: '%(src)s' na '%(dest)s'  selhalo chybou: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Přejmenování souboru v cestě '%(src)s' na '%(dest)s' selhalo  chybou: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Soubor %(file)s nenalezen na Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Chyba stahování obalu"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Chyba formátu obalu"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Vytvoření cesty obalu selhalo"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Soubor obalu není platný, nebo nelze uložit"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Pouze jpg/jpeg jsou podporované soubory pro obal"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar binární soubor nenalezen"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Chyba provádění UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Čekám"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Spuštěno"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Dokončeno"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Pro získání platného api_endpoint pro zařízení Kobo, přístupte na calibre-web bez localhost"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo nastavení"
 
@@ -783,7 +787,7 @@ msgstr "Kobo nastavení"
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
@@ -849,7 +853,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Přihlásit"
 
@@ -1068,41 +1072,46 @@ msgstr "Upravit polici"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Police %(title)s vytvořena"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Police %(title)s změněna"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Došlo k chybě"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Veřejná police s názvem '%(title)s' již existuje."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Osobní police s názvem ‘%(title)s’ již existuje."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Kniha úspěšně smazána"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Police: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
 
@@ -1183,14 +1192,14 @@ msgstr "Kategorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Hledat"
 
@@ -1210,102 +1219,102 @@ msgstr "Seznam formátů"
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Při odesílání této knihy došlo k chybě: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registrovat"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Záložní přihlášení jako: ‘%(nickname)s’, server LDAP není dosažitelný nebo neznámý uživatel"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
@@ -1382,7 +1391,7 @@ msgid "Upload"
 msgstr "Nahrávat"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Stahovat"
@@ -1549,39 +1558,38 @@ msgstr "Detaily"
 msgid "Current version"
 msgstr "Současná verze"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Zkontrolovat aktualizace"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Provést aktualizaci"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Opravdu chcete restartovat?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Opravdu chcete vypnout?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Probíhá aktualizace, prosím nenačítejte stránku znovu"
 
@@ -1594,39 +1602,39 @@ msgid "In Library"
 msgstr "V knihovně"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "redukovat"
 
@@ -2471,12 +2479,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2965,30 +2973,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Smazat tuto polici"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Police bude smazána pro všechny uživatele"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Sdílet se všemi"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index ae7fbfcfd0a44656a9805698eee5cd981eb806fa..be96d682b114d04eca6696eb049d9678a1e0376d 100644
GIT binary patch
delta 12079
zcmYM&3w+My|Htt!cAjm_m~F;AcAm{nX67*D&<rz&kn<r4Sz;~68%;Uv7loV;D{17g
zm@}csse}p%rKJ?29FkN2*W2}dJpMg;^t`U?{@&O1xjxtD`flsewn~3(t>nDq@3O$+
zpQ{xus}}YNRPX=)S(ac~8d{D?xE1T+Z&)9_8<_8<qd)!bc7GT;=ub!fwbt;TNIYZr
zAESq5Ij#6azQhM<_#75tV=TvX3}sbUd=4|Q54z(rtc0sk0hVAC?nf`YioSRoD`UlE
z%L+h0)N|ojnf0v>H1uGvrvsKX47FfBYN83YZ=#-i2mNprDu7bd^JS<&cA-C>Mm={0
zHP2mChOHFKstcj$!}?YW8u~&ftd0XQ1Pf4+&%<C`g?er`GM9A%J+VTn8TUp~YSl&s
z8ifIvhC?tLmDy5kihrQ9BaNtrmem#WF&mF!Kdhccc5p1l;Q<W88>k)lHL|Q4n2f50
zEYt>G!yqg|H(Z0>xB;u+PSg<|YefD7X`E(2Df$Cl@Ge%v2X^0=LQqDkp)%3{9oQ7L
zP+!#d3s7e}4HfV@q>QXHr~uvBeg>u@d$95vlYgDv8U{4MdW^^I7=u?(JM!aOJum_T
zaS{gO0=r*|LG+JcDE^GWXf-j<hoJf?sH5qGA=uYRBZ9^_RH{~@9$bS;^#P2=atz1H
z99%n0!m2n9_1tV!02@#N9>#(Aqup=W%*@{lb$th*HtZ~<p#|rlifbLRX=^X4djCN!
z;NIMvT?_`$&p<t&g9>C2w#2chRBuCNwj6b2zoUxt9{S*asQR;fxYR0&R>)Pgx}v@?
z9ktNAs4skk+WA&gF+Ij-(6fa(^Ny&Z%*R@|2o>N~Bnj3L)V!`lsUz^ms=EJSG&Erf
zYR8$#+*S^1;W@}nvzDWZ@)YX%E2v`q3v~<bp^m_(m1WhzC{$+Kp*A=OYvUNKi|=9>
z>swoC=<Ls;Ccb3*2P&X@s1&=gUDZNO?1C*Z3+JOUbqTfLZPYxztxbTzsD2$(2I5fH
zFCCqFfwZ8Z3EHF1s6VQRhGBi2g1QYGP}l1$>bd_=8S!XCP*@9<iH4{hcR(FQUsPb@
zQR^*0&A+k@`PW%&XMmusFHn82wq~LrR4Nlusq2giBoD)IF}mPx)B^ianfd`0&<(7I
zZWNA=CKeS~YYf5e?a05*cr*jri4%3-=h?1BMZ6DHOh-}I<^n2}zo8bqgId7tSu>9V
zwNNT5@HVIbhoCm-M9uTI8g4Weqb6E~3TQKGg8itYIfaV&S5!?@%rc+*qXMai3N#UQ
z))}bpw?!@3!*-}Wo{z4KJKv<Cvnaw;T#Y)z?~yBN-Lh@a-UKoVlNo;lwc~B5%$!7R
zpd7W}T~weh*(SgM45c52UYLn&)M>S+p)dACWnwr+;b@G<#i;9d7*z`oF&aZUm|rMb
z+m1jj@UCqsD)lEY2XCN`wpmBZ;$N#P|MAuRFQ%adOHn&Nhw*q5sYffclX*oCMrCRy
zR>opf;2SX(_hSrRLl3OZsw&Rfs2$fs&6|Ka(mq&)^{vq~l5iSkU>P>Vo9K-Zoy}P#
zp%48=s6gAGu2&z_2FBUr#TY?<2S(y0tb(q&Cg2*V0HV>UqH0E?EA~Q7v;noicc{;=
zqpH_~w~nlbO|Us?XX8;vHyssl5o+g)Y?q^+dmlY<18UywUC6&5jc*uGgypCS?x2cK
zQB{RZqz<iI)I>||@inM3-GRP%0;}OgRB`@=3fQ}wsf|d~(X~b$Wo|d}uYs2s2*=mZ
zAD1G(GguqZ9e+cm{w6Ab$Ed(Px|^NUv`s|?&>5*yYY6thQq%@Ko-;?*1@-+rCk?%+
zqy`q*{Sr*3e*pQpV%<R%V;Zw5@`<Q7;CxKNZP)^@qTYBhJxxYCqUP_1fmncgeh#)k
z=K&h3){4DMs=ZMe2t}P$B5LOu_V}}?7e{Z@84tu59Ev*Axu_#skIK}isM<J+{3>Cc
zMAeS(^G`Fu{ijirffrE=PQe;D3#(%>rsH<h8Q($$@E<ln*WPBKhNy*FplYZcDnngS
zJI_Z2_CM5-uf(VKe?1LNxEllT00!Y1)C=Vnss?=fm<4KJ9Q{yC!7NlJCZRSk4fT8x
zR>b+JKo_El{4mzSb68#X|1OPK^zLhZTTMd;{TGoR{niZ3z~iVlnp;1!U<7Jsv8c?n
zLM@n!D&}r>e;leNCZgtBg$Y=W`u)@L?{9vg=!Du)F=pX+s57iH!2D?zi>mIasGTf8
z)y^7p;3nIXsMP<33ar{dQ_OX-CH?NGfEEtq{wLDd&49d)dPRl~GCR#i^@n2!F2c50
zhRVo8Y=mipO-4qc0vdxV+KH%JHOqF1{rNgnhPDiLnjM{EKt*vKb%y_<BCj;WeD04b
zo=DWr)9rp1>iOQN%)Efg*f`X}g{XPwql&W_RbwT#d!6<Jr)_^k-G=L^B65AfOyGkq
z^n>x~k)WzP7WI4@YQY@T0{t-<$J+flSdac{RECb&<IYnw^x&@;i4}&Lp8?SrPQNp1
zp?p*ZrlK3pv-?Z%S^Dd-9o|I+((FZZi#nn*@FFThW6>RFAb~oqxis{^hp3cqMqR%H
zs4x70Zg|t~-$R|P*Dy0)6BS?`)I4$Mf$6B{TB0(RWA~p&9oaCf#QN5&G#WGT8mg#D
z(H*a$2i``d{t+s$3NM-WMF?tvFw~A4*k+<Ol7pVu54C||_IMsD(8>7p@Bi8M2a8b;
zmS8MyLj4Rlk2)fs;pPvAX!N9?jS8qcYQa1V#mT67mZ6^e0JY!-)SGn|>L^d4Q^itF
zBL(lHQdxh5Is0@}2Ku7jSVQgcH&91Yf_ee%vHcb`@pV)NpP(}5HqwlHqvi`mWh`<e
z`By|~4Cr0o5w(-SsEJ-h2Nt3N{SdYAF4XfUPyzgcdOtj}`!!!Sw;~ZWPZnyO-l%zA
zMP>A@mpOku@IC{YunfKN7%I{;s8s%l4e?jhk<=Px{xZrz)yzbU!R@w}u>pPWJYy4#
zr9T3r@ja}I`<(U%KVuvNKChUG8l!{$VAK~1QGskg9aWj#zly%}Z=x$cK`(R}ZH~YX
z)el5{zb^V=42GezF^vcsy)hoAVjbLs4*VLc;w`L%6<;+~?}j?t0NWr`0JTvW49E7E
zh*fX`Hpe2=bH~wN_x}`)L<W9A?X3D3b5>cXYdHXuaS1AgUtw*$k4YFf)@&dPHE|wl
z$N8v$r=T`aX!{;210_%8{CCjMj*p-sy=p)3FDfw4e3QxyRH|E{CdfslbRepjhM}(C
z8>nI|#>%)C^@=`*dcGVT_y_v3zUBRz2_P7?Kn7~3S*V?lMb*GZs0mJ@uH#ws!8;g*
z6$|*8kFltQov3SAgf(zJ>iLgR8QF=>KpMws=tWVEiu{JH=j-N-BT&!9+P1QN9u@Gb
zsM|6Xbp*3enV5?TV59x{HdM{*Lj`c~b<SUBb%p_dyo?Iu4(d8RK}8-t&P<evTA&>&
z<sDIHJPZ?XBq~!&F%l1==Dmj6`4bGl%HvIKg^efw`k*%hs@j)O0pz11b)t4yh<a`w
z>IjNawNiq5ZYOFZpW6MSsK8F30y>S#&_h&aTqc-|)^*a*KnBjNz+b@_ME~cBycO{g
zIxuCDdC_#kF#2;)Df|Rg3!kF{f5J?xFxh0VCAOzO0=0o{I1CTsaCF9#fp#<&VF&yP
zmE!m*=I43}>I^5MGE|85a4st4WvCRFqcU|5gVA-Wxuy=(bD5~|QK%!Gi6N|St)ig?
z_n;#D47Jcn)PxsMslJ9v^&?a&D@-#Bc-h9F0(lmzVQ<vJd8i{;VSj!YL+PK#aMri(
z(}-dq^bHe08`KWFqKc&emBJ#_*`Kw?FQLx-Hfq5qs7(16^0xp6V>m8CWp*zr^<LAB
zW3VUdTNh~P-Zp&G{2D$BQ|Mnr2UdN{>@*ow8@bpDN1!sa5w)Yes7(HVs*TI2%-u$J
zbeUmlr7~(`G3e9>&1oogZBY~SLKRhi)KN^tFr0xp!*!@zatKwVUt=S5n`wSZHb?cx
zVn<w$>G%M(Udk-<f@(60{HHSTECZTo5^CWxBwN-g)XtupZ5)dV<Xv=N8P>z^unzu<
z`hHN6`I(T0%0wU3JfkoUi_jZ)6p{bxG!8NliRUp9EBw#=d{4&C^!uZ#wiNaGVN@pW
zquz|w-sT4t#$hZLp?10*lW`w<;oqo0AERm})H%nTWfCgVv6zH!qK;$-a!st`_UFH$
z7XB9%SioHKzwKT?EwBW&vk&e5C+I_e4?cs(Q0w@<V~)h>pizZ^UZ|Z6xBJsDm;OAg
zidV1`{)4Tt?YkxuvoW0h9#keTV>>;EzL+`BjCVpE!4TAX(~M4Q9*tZER-<-y51V1t
z`KIb~P&*riZa5AV=oC~fEJCGp7b;Wd(GTxo47x2aN0Nv-``+k*Z=sLw|6Cf{;R;k_
zrKpJxU@Bh3zUcoRg@mu5YT+x?0>7Yk>bua~icqXfKMIxlR8%drvd7z_gMJV6V14U#
z8cNMnOu&^`A5UNde29uTZjpH|73<RPf_fk1V@;fc5m<r&cmh4K997&mP=N+4Hnmd^
zol5Cg8ntl(CgT!}$FHy<K15BBw8Tu<6ZQEZtci2cAJ?KXvd8}XR}7*bu+$uF0xGa9
zRG|Hql7BS{8PHj-!)o{?>K^}O_aCEDUUiunk4Bw&8&u#gpxy(8r~pb(^PWa6cpr7N
zKFiGpYGW|{=;h>JA3Vc=7Vd_DI1DxM6x8P{Q4^J-Qg{e;#^2ig%cxA;LIvu%!p!GD
zeJ>T2=`7T3>5M6u@1)_Nu@-f0j$uFaUumw*XlzFREz|;sFa$557J7hMpz12Kqe#?I
zv_w7E4ON7%*iJ?jdl70Q&J{G$X>7nI_$xNWy2YmY`=iF^V+NkI^?u(3-q!X-RO)Bo
z5ZsK_G4KQavc`DSwOoy<ScV*d)B2r82L@bLoBzX^i>m&GsG~TDO7#WQj(^7%Xnkn@
zplFG@UQ<xFWCm)-@1W*gi7MXfs3Wen#%v@CyXpQ9qS1m6wxc4vk1pu(kx8WwYGDWJ
z2pXYw(AgfJj*;}2VFZ4Ts+r&I@dp@2Kdi(Y$un3$zdxq3zIB#{c3OF@nJ66frpiWL
z#{$g4b*Ojy9dt!&omt2YJ?RFb0uMtkj6?;Jgi+WE-EcU%<7jkNqA`v}dz^&2uSakQ
z{)|dxyN^wgbw?G~a8waZLS<$S#^D+a#nV^^Z=nLHvfjL~!cZG+jjH}W>&d@TK9_-(
zxC*`TXVk)fq8C0wJ?Fl`q%aV*Knf~=uGkreV;kI!9kIej^S;PI72`+@!D;yPmA{ev
z>qSt?fU5pDK7$^cOh!7OB3_6(!%f%+PoWk_C^h$aB5J3_7>%1z-}?b|eQ#rHO!~y6
z{xuAzKiNq`k$iw2xYh1|ikjdg>P)ZN{TrA@-*vN@ped@V2cph2AANBWw!<RShQ38@
zpyn2{;SAJz&h9j7(dcJ?Faa~^zlT-u464|ELrr)C^~Hu|rkI+eKm9fsi#@S6zG08Q
zk4pVk)P|0uAC@CW;k0hkP|^8qH7}4D)B;^m#n}h-f*OGBak2gRFQ}c~K<)eyDpM}o
zObvLVHjsn$Z~&@i3Q@OdHFnVb|C5I9ZIkWhgMp~C`WU0}7AgZlJIv1NU^V*9u_AWC
z80>EMotRF48aBt>n2HZj^ETLNe$5|?$*gZ3rlF#GfU5Q$yEsQ2gi7T(RMq~2%1pK0
zX2M#iGtI@iI0hBidzgmnP{nr{6=0n`W;_d1=ubgseHvvnl$y(!jTQEqd)yH<(Fp8}
z@1w5QZB(ioe`?OYIqFPvQ2`9J%|~75nW%LZU@(4Wd+}5I{@-Un6L{=16V$Y=kAaN0
zz#7;SHDMmA=q8{t@;2)G3+?fbP;bOtsP7-Ny?{08-?95X`<<rxBleq#TcIZEget0j
zs3IDQI+_C1gws&tORx@pjGFj32H`K5h)=LGHaK8@S~f*}-WQdT0w;|)8mm#ob`tfD
z{udR9^_kg871V;k*bU=Q#WV%=+#%cVuqyp4SR4OAWvIsIriSXE=4pb;sIvnNMKl<7
zc9T#$eFwGEWvB_uP!oNDx^`cq7QSSU|A{{I|3Q7<^`PljK^;YHtc20n0_$T--T#+q
zDAk)#3v5SyVLv9}G1P>QPyxChGG`xxN^Jsayoue<L09^HP#YLzkB`Ud^xv|_m!rGx
z|5h6De6Sar;5Dp^QD2xdY>x_H0;+o7M5VA8-Egz*PJ9|Tsz{Gv2%bSb|2GC;rNib8
zTNAxm-|9(2H82E~!nqiWD=-F++TO-6`k_b6*=C}Ot{>`q1?Y;?QGw1z1-=G#TRuSt
z9z@l~6?CcyT#lNFLQt7VMLjSGRU1=LkuOE1v=p`Q5mf3gqf&d<9``<Go(o3>+!S?7
z`e6i4MtyJfG4ij}?63!pqC5SIn1xrc4K_G#erL<aZ2F}bjgK%EBfd0&cg6(zlQ9N2
zpaaj^<M%P0e$-dy`vblr|B7rT1NCt&>Wy~>-O%TR`4cPv)o+cyn2k#H^LBp#deYBB
zZybkuemeSK5ys&XjKnWc8@u78kxV1yYZJgw)LG3#U6(a>e;vBe-;2u7XXt^)Pz!#8
zuj7xXqw0Cm{8jxjD$sqXqdtU9@d7qSXV5A02JDIYARnV}Gd95U=s>U2CS`G`+USOw
zcntdCI8=Z$QMK?kDv;HvV%&)e;9FG2uOYSJw7kDDFPL~t;Dbz5Do3F|zHU1kHNgs0
zfLl>Vb`e9->s#}DG%BDbs3XWmrM?SR#>uGKn2j}_-hUb`8Tb;Lq3?I5s5+n~C_sH-
zGFHJ7OvRm;iGQLdPB>!%Z-Uxk8?1^iU=1ulZRl-OO%!8YCyh-s^o7%?GyNO2qlf6g
zptI(PGEmpA2Wr7Q)I<|eM=}dl8*5SXd}8-^q2~Jxm6@NgI^II3B62%t{(oH%>b~cq
zCK`dtz!<ED<FO*HK-EeyYT-+mj*l?_)4n%>XJa7!k*G`+Vl_O7UU=?%oj;9o22?yZ
zQ32gSrOy4lc`yhy9*zpE5voQqQMV+^wj=7Oa_!G2pkC$EQP-{nDLU(Gv?8Jh<>hVJ
uoRHIOOT@?vem=?ZiAnK^X^y1SjKq{Jz7s1|sL*(e|D-9|TaF)@=l_3b7sSW_

delta 12175
zcmYM(33!gj`p5ByES4aPY(#hkNo13R5V0ioeXV^DQcEputfl%?ZPjY+swiryC`yVn
zRWzq4r4-#LM^RO()#6`EDd+n$b6x*)opU}j^FHs)J@?%6yy-c&c6(hY@NzE%c`tSN
z*Y)C#QwfKLsrUc?+M47z8rp^_cnGWEJxsueTIPGLF^GPS?N3Gz{iVpiodW(V8n4=Z
z*<{Bl={T;_h(>olXo)>=71qZ)n2w38>VwZ>CXT`qxD~x{7b?I)jKPyw8t-E{^h$M{
zG8lxxSOxW5ou}ij<MgAU2S+>|aGc4g1!tiqdc(R5_1t^tk2_ES6rr9!hzjH=2H|DY
zbAO}e@u_Vx6@XFn6R|AoJDq9h3j;6&U%&{QgNl4TR>U2s=Z+zBIv21M2G%j-5lBj%
zBvhdFFc@3nQ0$A!Y!NoZf6(nfqh6ZhJcF~a9iGJjSfj4vw8xnkkEgII{)^f{m3od7
zicL|q&>OXZ*;oNrp)VGoAMV2d{1SD9Ki1>?!)RP)Kq>kMz0rq*FOQ{B{mQ6}R6}JX
z6Ft}-wa{qP_vfI_b`dJzJxCcjS5X0mvHc8ej_kp4>yv+-T>%4{U@s=(VXTRNqjpq<
zZ}r49RKRayMcionMOcCU8H~i+SP=snnCIhB{bs168GsQu+NDv0##~gYwxb>_K&AQ=
z#^N2Uj+HpLR@ejsaW3k)m8byrp#uB?v++;c@6yQ3KLT}qpGR%jT|z?(u0a*o9%R$b
zaa8q|Xlxb;L!DiH492#o=Lez!$;Bo(6P4;OP?^1hI<g0-;`HSXmqmY6{W*~|G;vqt
z$~r?(Us#G-XdUVcAES1D2vtmFvq&daK%IGiR8h{tN|=WV@DP#&=L~Az5Teu(L}4K7
zJ1I0YVKdZ@J0WX015pdFL2jC}4ONtvP|yF3D$Zg}%`Nan9YG{k!Fs67_C#$k7c1io
zjKXzTmGzxNG<5dAq9(p+{Rb70FWXd#Ls7L5i(Rn`w!sakOx;8+=+)fJQyCRtobA^_
zWuO6;z}D#M1=5*@Cg_7Yqp_$Wnv4m!0CgMop;G-T>N)=wCL`e(PCo(lK4^j3aX-{i
zj7A0aI%>U*sQI_IApbgx!we9-^F69xv89=)CMuO#sMHNY1>#~=+>G9M47I>XRHkmA
z0{R!LVQ4FJG#RMCx?u$7v?BjH<LM0OZ0Doy`+DmqsEEHt71LSNwfP;D%6q5<y<3|F
zLQ(T1qZVq83cNci!11UJ&PUC&+NI%3V>4=^9jJglM@?`Nbu^by5#L4CL{J;^c@!#;
z+NeOYP&L#R_5B{G1&3KD+VNTF!??SQhR$LY*1=t<GrW#mS!Ob3q5^ptQ*kk>+P^?$
z<|1kXcTfxZv@?MQqXMjsk(h#|u@kaU*Xct;UmT9g#1xFd>6nO{QP=MWR4w?mH@6@j
zqv?0EPDL%S&RT>@{RQlV|DukzLkIqYL-?<9y8rn!v|tfx=hrY1pCI+<Bz82f=y9k_
zy@O>i9~Jn1jKh;y6CYwptih@(&Lq^1Yoq3EjLPIF3}Ag{I*k-ugc*1c)9?xUVOnQ%
zR!y)h{Z^<zyQ8kxDAWe#+VOm>LH`IULpL!1L%NuNqfr5*qpPCoK;s!4ftqL^YJp!+
zpFcuXZ#ZuqSsNQ*N7T+<M;+Z#RKTlHJI}LjLp}Eqmco6gc@K9b|Nb<7W<U|%K~3OI
zG%CIT48%@IJv!N_iMH7B0@Rrv!E$&3%i|xY;w;w91RQ~?jk>6#>xMeY>~7>=11~aA
z9cN<@ZbANLaQ0&fyoXBt6I1|YyPN6`N9`om+8h<YAf#TM@z@iKP#XyEVUBDtYU8d;
zLvO12b|BC83o(`PQ^@a(<IOB8#+Ina=b_$!8!!dGz%0CvdgImaWir|yHUAh4!#Swu
z*I*X9r)a2JgL<1(N1!s0h&rn*)Xv-5@m{DG$8)GNegSLZL{ui$qK<4YDpMy=wQ&~t
zlft=(s-4Pxo@RpkPa~XxNvH)EU?{G@5X{GPJd8SHr>_aXA8XMKK`qn*wNPhN4fRB2
zXb5WOvrvJ(i#qb{`1JnorJ)@i!(cpx74RymXq<kg1}dW#h{kwK#M;;!m5Db|8(4&@
znN?UEH=qLDgevkMuo7Ow5Z!;D{^kV|fywk+q6a4-e*!qmF$2$`-e{o%%z|mCon@dh
z(-pN~HmaD1+WuTrP0T~hw*!;#4(jhuCu*SigJJ+`NBP(We?g_T)*$nbW*MmJUWnSs
zMpW$-pa(y*UPPt7ShfkQ8mgF6u?gm&0@{?#{nw6<F(4nIUXh7|%})EG`cp6h^ROiz
zL}kQp2!Cc_OVkm(j0$K5s%Yn-uGtFf2ln$ls0<w#;+h>@V?agm2z7>~hMLIBqjnsH
zDxSKiowv6A-l*rFLp?VEm9e>~g_oe_-GHi{d{m7UT93Q-fy>rEQMcg{s)#~z%mk6>
zO+OBw9to<-Gf>aBL@hWFwZK@ch%;?}4OXMS3zeZWcHF&0Ll54?XbgPT{05|Bb^3!)
z3(Z1hU?KYAdfWd1Thrf*t<Yzf38Vw+7WGGEU=k`rGqD6NM*?-7wKVj=Zd4V2j{4#$
z)E91`7JOp+zQfJgRz!`*q5`ainx_Gl#MY=9=z_}FK-(XQI<m>=rQiQoY1C(6HmazK
zumnEDlIS(Uq`nL)ut4;|c+>(ZsMKd#JE1l*5KG}0RG^dXxQhz(EqwaV|10eWn^6xI
zVjO;kx;DR|jwo`Z`3Hw|EJeRBDxe(Hf-XklTc~-qqMqA{T5uog&3Y7dl$X#|vD~3i
z8%sWCQrQr7_N`GF7>#;kO|;{SQAbmVdI5c9y@D#TN2monqf91KQN^2q8qY+{+hvsf
z{qMtoA{&W%=TArN=xx*&-bW7>q5?jP3g9N{`QoEZAmOO@M6&I-N8OI0sClNL)|ro*
z=l#)~zf$|Dec*f4gxAmyAEP2IJ;tQ8Jf_jFh&r0in1C}-wX*|j;tgxaSo7}Bw2s9%
zK3{{ec+{m4MdObBAoO|j<I)5*(P;GG+o&%TqR#db>d3Cyex(;o#;T!;GZjl?I;xnP
z*?v3J_j{l}y8UTXr7;?7;CxKP-B<;GMh|-BniN(?FZy+{EM}n2wzahbDuAx24EDmd
zI1~eLJ2u85<T=-QLL-O)pK<0lARM)`HmI|jhPs|hFcnXrQdn%f`He`x6#DH@8<>U)
zU_B}Wn^6Jp!ayvv9z}oM|MO29{4*VD$B$5vR+?Z^l!(dn8=+D;2Fu|@`}r(XN|&N)
zX%*@kevB%{@30KsLKWj<)bn8z$t>$Tm1$_gOjH0JZGQ}Er_)e7&qLL~In)H+lgzdB
zLmfpd#$a9Sh67Lw??eS&grRr@_54rhDkXo=2*W3+7e?4*6M0o@Bh(r9Mm;ycI??(T
zY6I`1Zp&`e5$s20;vg!3%l7l%Q1jiHO#T(XeFk(^rC&6)5P}LM7Ih0!QIYpUO*9U*
zz*JPqr=!kz6(-?YRHnYhXuOZAu_{x{&Qmd%e%2K7U!O*I`@wuv)xL`gU^6Pxov0la
zqEdGlbp+p`YUMoYxj#@Fxo!LZq5>;E)db{=%1|v-X3||6N@))}Fb3xq<1ZJiz<B61
z&J&Z-gTpWbUqfBn1E>uCf_g>YLk|YOZ2m{AG*kvBU|U>++Q4r(9NqggM$*V86Rq$o
zY>&aOm=tGYYx=`bso#OhP$5>sgQ%2WL!~%uy2(@=R-|7aD`Pj*bK~szI^;-QXCI9S
zKKK@OrhlO#yo*}M`&Bbx04mj0P^nHvr7{h*Kx1ovR3I;5d7O`0cs<7AY5Vy@jMV)v
zH^cneC14B>bU_91B38pWsAAcIN?{S|?EPk%@gUTh$DkHWMP;fbavDxYtd3uyGJ6Y^
z`o^=6^_@*LdSSq9b8kmrSNi+0HU`cyXW9a_(`Qk&F$<gG8dPy!#z?${%B25mrZz%Q
znTx>^n2xHIEPVR=-`{?ai%Q)T)C6y$9$bt%iXB)L_oB}B0_v7LKozOiT=VC62By)^
zwf#KoK>s49W76v;kYTTrf4!l`GEfI!LQRy9TKF20Eyw2#v$NN&d8k0XK#!h79aX7$
z<_(&N`hEwjfg@43WC1Ee>o6XR=8=Ct8ox6Tg7+~R%e`sd`DvIy|5@yei;=2zuGr5X
zqB4>2mbu2Qa1i~07>7lul;6Nqyo04NdcFxX#igO5>4G}T98{!vn1XvyNAf%BmOQba
zM=UT4C!zvtjmqFVs0B`-Hg?wbf5Ec!|H5YY7`2YubfGzuZWzG8o2VDkYTGZsF7yv$
zAXZpJMPocR$0?YMpJ8?U3zf-`#pZnykLBo(Lyf<RI)dfMdahGo8qQ(VLT6AZjay>=
z2ZI)<s-J<{**f&aZKyzZp=#kPtb#XDnJTx`{Cvk@P5K$ABN>W1`}tT>_y1EGO3gvk
z4o{;paRoKe-&h9&m+?<C*b@8U22?E+d)q7!j@oHcEQMXL4E9CMKO9vH6YcoR=+XUu
zgGNc*ib~CHOu}za#aDc}`6IFx>bZfa=Z0ex&PKftHe)y*Kvn&D494Q`n1I4i#a$H@
zXlryk)96V<Da}KrdON1#2~5OdE6jbag_<A-wZnO+&zGSVK8Qj1UsTHfvY%I6X##AG
z6&W9l3T)a+@~=o2F(3<3XL$k3qqEA~<6u-j1(os^cDx_z%wI$W{toIrP>2fPJZfIw
zcg=zcsH1Iy+CbNL$-g4%XFr&PTIe+l!&Rt>ciGRsK}CKAmBI(8GcLK>^g~dYsE!J>
z5o*3}sP7F&WqKOww#;;C)TXf+J@{X2g^zInwp?Sb%|>iQ|5MZg4=@6Q)|!QqPz$s`
zZKx0GC?=qudks~D8>}Cpirp=up`Dz@bi9NOu;P2>|2FG^b?7ffjUT}b^j>GoL=XKb
z)|IH#@5P~b6+^JydMY2Y(I3ws^SaJ88j3h_gZX((#}@Qwp{oBF>L~7`QXR0->^Ks$
z=-0u<I01FNcA;*`Uet~cVSD@rRlJ_}&5^Xi4Bh{}G`jJ@GR(pos0b4_nLjidqEgue
zb*9}=NAMgfGc)b@Cm2otB-X%tsA7xEGvi5Em40{Bkxar#tnVzQp^5x9o1JE%ChCQH
zQ@N<?xCPtb1=PDe_5<@XT?e&L2A0Bh=#Aa6H1<J#o`W$s5q)trx+Q3Aq~V3zur20e
z1$=}<F?5Sb<x~u&KNppe)u<xMM`h*!#^a9|iN0IS^{kExpgBfichr$i-b(&e{R<dS
z$`4`_{1*K%bemZ?3QN;ZMm^U6mBMyd1&5&mn1h{hHMYP%u>+=kXx<|;P{p_w_5Fem
z$^X-LJ_9PkE7%a9U^8sE-DKnyRK&+nXZSPrL!TXHfx%dv{tgVl?=TjxqQ2*!Z?10)
zHm9G1%KQf|4Sn$=48$L>Bwn}u+o%b=KQd=p3DvKPb+JC``_H3ZG)qwvZ^m+%kFBr>
zwV{$b%?8?|Htdd}p#|q+C0t}b*p8X>kD_)|dY37-2-JjCQQsSZDyCcv!WS_P=V4|1
z*p7dXO8s@z2A-h5?tj>Ba~3hEqHBgVu|H~oIjG`XfO<hK!M1qZejZ+6c3Ks+^JMhK
zbW{yALTz9MR>LKznkmFKy8mZrv}YjdV{>oEqORFe)LH$6u~@y(WS|3TXU|}H%*En3
z8x{Cm+uw=l^b1fgs6Vj|CVgV&9fDn1-^rtqiVsmmm9)oH`x`ic{xZ~pWj-~TibrLp
z6>7rHsG^*Ox?Y=5fgQ!Vcmeg>5wh0=_zY@%8oIS<?4pr?*HEbm*~itwG}Jwwj{3qH
z?2O-|QX8}1q<S>!>~oPbb!MRgSZdvjy3YGh>wJkSzPtO$zZ!v`nJ*?-8=@v?ZykhT
z^v7c;&O=SO9<}gxR7O5W1#rxcpF_P7Z=$|`-x^S4Ug5DtuKAz|1C@B7H)`UEsEJ-h
z71bhC5v@SIh_;|6EI^H)z$*9?hT{{gfZ_i!e;ub{8Tv!egU_QrU+B_MO15A;o<S9x
z_vhwXC87eUgW5@R)Pfzc8xBMj=`PfB53HpQnD<Eqtju^kDno5C0-r(6<Bp}Fl)i$B
z=xtQ$^HDoJgxcvz)C=kwYNCHoFBq?bX5k>zcode!c+~gn+kSJ@2D+jb_QNdQ|3NgG
zFz_BK)jy*qx`Fz_|6vL~MopM}$OPB`b@rW5sU2*`$J+i3^kIAfY6Hvc_=gxm|I?@A
zoc}2rTKGC9;w@}|RlYFSsV^qee;F0Pc2v>sL8b6J^u?>zKk#Ybs9JiAN_pwS=J{w0
zre6;;S>I_-Ll4eF)xdI83J+o&p2nK^uQld~x$j+2XFCq{qFID0zGJBGUqK(djSBca
zY6IoJG?}Z6u7`mX8k(ppsuo^AP4pTnBk$SIzed%_P1Fub9yO_rL_ME|s-2Fg6c4uJ
zlTk;o5Ub*5)NMI-l=H7a;|2rzV&E~8q8g}vT`YlZu?=>`7PtyC@G`c;$gj+;8G&*1
z7oh^*he>z?YhuOY=K3{9jprOE|4Q8w24e9zDzdwnfT1VMo39!A(w~C0aJud1V>$YT
zs8k=e{o`1Q{(1DntElha#<KVT<FSPMwfS4GHfm>mP`?FhQ2~5|s&eO~xi;ld{V?>#
zI8=seVM(lqS}+SIV|&z59l|d7BP!5@Q|74MR2mH#XoHP$HtJ1y$c|se82VLCo1M2p
z5B*7~j4emi&VNu7UqpYriVE;9sumui0tx)a6k{|}Yp&CThEm=ORUDHs5LaLlZbhZ?
z90uVp*88Yp_50QY7=_AMThx!%B-HauQ32(lj-U{g`p>Wo>pM4Ss5tJUCXD*dypZZ+
zBl=TOMfC}4f-9)!Z(sn1d~be+qcM|yUo3+wQGw^7Huw>0W2Z3`uV4`CI}d57D9Zg{
zUO1IdU&utA=|I$uhNA~(qmF13hT%cfg6C25Tt^+rJydOko-y-OM)hM*^VLFEsp&u?
z1pA{>HV*6IY}9?<kNV;nR0b|$HT)Hequ*ImL*-Blx5IQCiNUxYJy?igcovnZTW86C
zc^WA{nm1DmRP}a76;D4@K-s9&jmOeB+m0_p1-1c|>aD0Bmjde^)KTrXpI^f$`nNF}
zL(Y+36<xz~J69z2Y*g7ZX~d{ep20bup*f>+#^((6JUcemlg-eCaXGo;cHVgIvVYl>
z#FW&;)KpJO{fy+gJAa(&RjgS0&I>QS(ym_f>~Wr^2lfsbo|BuKGc0=)v*j|yfxS=X
f$ni`VV|yb;kIu>U49gjHpkUmP;XC^sSsL^|LQUp8

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 10cc56e3..d312bfdf 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2021-12-22 19:05+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "Nicht installiert"
 msgid "installed"
 msgstr "Installiert"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -46,9 +46,9 @@ msgstr "Erfolgreich neu verbunden"
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Unbekannt"
@@ -160,7 +160,7 @@ msgstr "Möchten Sie wirklich diese Domain löschen?"
 msgid "Do you really want to delete this user?"
 msgstr "Möchten Sie wirklich diesen Benutzer löschen?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Möchten Sie wirklich dieses Bücherregal löschen?"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CA-Zertifikat, Zertifikat oder Key Datei ist kein gültiger Pfad"
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
@@ -305,7 +305,7 @@ msgstr "Datenbankeinstellung aktualisiert"
 msgid "Database Configuration"
 msgstr "Datenbank-Konfiguration"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -349,7 +349,7 @@ msgstr "Benutzer %(nick)s bearbeiten"
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
@@ -384,7 +384,7 @@ msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
@@ -482,108 +482,112 @@ msgstr "Nicht konfiguriert"
 msgid "Execution permissions missing"
 msgstr "Ausführeberechtigung fehlt"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Buch Format erfolgreich gelöscht"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s ist keine gültige Zahl, Eintrag wird ignoriert"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "'%(langname)s' ist keine gültige Sprache"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Dateiendung '%(ext)s' kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Das hochgeladene Buch existiert evtl. schon in der Bibliothek: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Die Datei %(filename)s konnte nicht im temporären Ordner gespeichert werden"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Fehler beim Verschieben der Cover Datei %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Buch wurde erfolgreich für die Konvertierung nach %(book_format)s eingereiht"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
@@ -596,174 +600,174 @@ msgstr "Google Drive Setup is nicht komplett, bitte versuche Google Drive zu dea
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s Format für Buch-ID %(book)d nicht gefunden"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s von Buch %(fn)s nicht auf Google Drive gefunden"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nicht gefunden: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web Test-E-Mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Test-E-Mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrierungs-E-Mail für Benutzer %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konvertiere %(orig)s nach %(format)s und sende an Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Sende %(format)s an Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s an Kindle senden"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Die angeforderte Datei konnte nicht gelesen werden. Evtl. falsche Zugriffsrechte?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Löschen des Ordners für Buch %(id)s ist fehlgeschlagen, der Pfad hat Unterordner: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Löschen von Buch %(id)s fehlgeschlagen: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Lösche Buch %(id)s nur aus Datenbank, Pfad zum Buch in Datenbank ist nicht gültig: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen des Titels '%(src)s' zu '%(dest)s' schlug fehl: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen der Datei im Pfad '%(src)s' nach '%(dest)s' ist fehlgeschlagen: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Ungültiges E-Mail Adressformat"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Fehler beim Herunterladen des Covers"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Coverdatei fehlerhaft"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Fehler beim Erzeugen des Ordners für die Coverdatei"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Cover Datei ist keine gültige Bilddatei, kann nicht gespeichert werden"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Nur jpg/jpeg/png/webp/bmp Dateien werden als Coverdatei unterstützt"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr "Ungültiger Cover Dateiinhalt"
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Es werden nur jpg/jpeg Dateien als Cover untertützt"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "UnRar Programm nicht gefunden"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Fehler beim ausführen von UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Bitte nicht von \"localhost\" auf Calibre-Web zugreifen, um einen gültigen  api_endpoint für Kobo Geräte zu erhalten"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo Setup"
 
@@ -772,7 +776,7 @@ msgstr "Kobo Setup"
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
@@ -838,7 +842,7 @@ msgid "{} Stars"
 msgstr "{} Sterne"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Login"
 
@@ -1055,41 +1059,46 @@ msgstr "Bücherregal editieren"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr "Sie haben keine Berechtigung um öffentliche Bücherregal zu erzeugen"
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereit ein öffentliches Bücherregal mit dem Name '%(title)s'."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereit ein privates Bücherregal mit dem Name '%(title)s'."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Buch erfolgreich gelöscht"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fehler beim Öffnen des Bücherregals. Bücherregal exisitert nicht oder ist nicht zugänglich"
 
@@ -1170,14 +1179,14 @@ msgstr "Kategorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Suche"
 
@@ -1197,102 +1206,102 @@ msgstr "Liste der Dateiformate"
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fehler bei der Suche nach eigenen Spalten, bitte Calibre-Web neustarten"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registrieren"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Eine Bestätigungs-E-Mail wurde an deinen E-Mail Account versendet."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Rückfall Login als: '%(nickname)s', LDAP Server ist nicht erreichbar, oder der Nutzer ist unbekannt"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
@@ -1369,7 +1378,7 @@ msgid "Upload"
 msgstr "Upload"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
@@ -1535,39 +1544,38 @@ msgstr "Details"
 msgid "Current version"
 msgstr "Aktuelle Version"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Nach Update suchen"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Calibre-Web wirklich neustarten?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Calibre-Web wirklich anhalten?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Updatevorgang, Seite bitte nicht neu laden"
 
@@ -1580,39 +1588,39 @@ msgid "In Library"
 msgstr "In Bibliothek"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sortiere nach Buchdatum, Neuestes zuerst"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sortiere nach Buchdatum, Aältestes zuerst"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sortiere Titel in alphabetischer Reihenfolge"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortiere Titel in umgekehrt alphabetischer Reihenfolge"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortiere nach Herausgabedatum, Neueste zuerst"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortiere nach Herausgabedatum, Älteste zuerst"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "Reduzieren"
 
@@ -2450,12 +2458,12 @@ msgid "Sort descending according to download count"
 msgstr "Absteigend nach Downloadzahlen sortieren"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Sortiere Autoren in alphabetischer Reihenfolge"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortiere Autoren in umgekehrt alphabetischer Reihenfolge"
 
@@ -2937,30 +2945,26 @@ msgstr "Von:"
 msgid "To:"
 msgstr "Bis:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Lösche dieses Bücherregal"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Bücherregal Eigenschaften bearbeiten"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Bücher manuell sortieren"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Manuelles Sortieren deaktivieren"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Manuelles Sortieren aktivieren"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Das Bücherregal wird für alle und für immer gelöscht"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Bücherregal mit anderen Benutzern teilen"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 4068708c27897b675a4e7d1e2ee166871fbc2096..c4b1af88a4f7800b37b4be3af13947671b1011f8 100644
GIT binary patch
delta 9530
zcmYM(30PNE{>SmFxIuuj2?)q4f&v1fY@(QgxFCj@OQPwxk>n_9W-h-JwbXFSea&3Q
zrBbp?(Nx4-N*&iybD1p17Hh20!p8pZ59dD5e;yxR=X-wl-gD0Pe9!$sQ&#CT_n4F8
zre~dH7XRy3+p+?&*i+H}|F0s#vJwanVL1MbG3eFIT%U=$rO=MYVhC{=Ho*6=4}Of#
zqg$k9rQ$G5u`GwRo<?0du3`uL8tY?FbIWqVX6TF2$UmziKU}Z~-EjiCVkvs#BIKX7
z#qR$Cb=@^PzK<I35xOwG^=D0kL8Hutp4gBJLQxY)K;6&=HIa1GihHB38-be8E2s?4
zz%X2oZg>=R{W%Q4e_<1RiiwPG`A1upGxk7T_&heiBGk-FP%E2(Epa)9;xW`fcTrnX
zzlCM_U=sRcH>`)l@EIJ9jc^jy$2ZZT6)mDs2e+da?zZEjsMMao5WI+b@NejX?#zbd
zS^lVrb>v4pzKojCdQ8JJ*cR*2sZ3^|?(Y;s{$pwMq=Q9RQ&B6}ihZ#HH9>DKQp#db
zaTnA?24fITwm)BCf4<j_PopyUEjGj7P#I|wXPy@tNB)({c66{E)*z(7tvApEccDH%
zj2iGZY68_b1U*}s2Tnkpjwz^>Z9q+U2Wm^JFcrT<J<pRgX)BT(G&E2acErBOqODb^
zRGmOK{2Y_;8aBd)oJk$a5PrB~KB`6rqpqKT&)`h#gbPqxbpcf~)u>{11SOgoreQle
za#0VQhwiunJ#Z`Pf%~x`9!DM5OV}E{`Jvj$LDkYg48|d-Ow7QhxE3{mgUD7mteZ6S
z;BRgJgBsv}sDa&Bwzei1yJ8ONflE*W?MB_d7d7$2sOmn0&Ug`Zn!ZMD-FK)AKdtF!
z|68`P_X3rYEYtu)Q4g4gy73KEDmS1q^9?q}hp3f0Q{q}-G^&_$P<vg1n&?vW!&RvF
zz+QA?eCsR?AH0E{_z<;{y2&O3o~YuBK<#~d)IfQtiH<={XfCSwR-!Vu2~`XGQ1?}$
zGJDC6@1jEk{g;MTTALTLQt67i!Ou1tRg7uqi<wCFtbW)S%dkCeMsNHEDGTd&)Ph=4
z`kGLC)I@us#vPo>{_Fe})1jHqL(O;@)~o<^UiYD@w*q7FE>a$rXPQZUHbxSUuq{J9
z_e0wYsEqxBdDt-BWPETs`Ol?eA|0ApCDt4h)XJ(+1A1^Yvakc{MKT+eiJhpGRH7z)
z9$VnQP(|mKVfMZ;YJmZ$=S8A2T;QOgln+NY9ETcM{eid~HKB6U0M}6|{s{xHHhJ%j
zO;OjCpaxov%G?&z^LL?&aKHWeA=H*TPSVhWE})9z0cvJXQ8za1VD>fuHGu)x6^l^=
zePs6^MHTTyRA%mD1lGzlH4urEgO!T)u>`r_VZBB}1J6cHWSQ+A^dkNOm5Dp3>z<+?
zy7RhJ+#D4rql&H<^3N*eM>tlY7IYtVT{UWgUeD?c>YzGlWYSTH+Ozejm2N{-?<c5K
zeU93qD|Y`~)TwxkO6~tJ8f){C&_ZHR&&fe$Y5=lp)^JS6O&G}d)-4*E*`KI^d^(#N
z2u7u}Ev8@(RFTd`4ZIXv;cC<Xr%`);8AI^~YNbz6McSAO*8SnA`xDWjVoIUmkGU9x
zBT;)a8}-04Y>7*;4jw^Gv<h|IIjoIWQ4_j`O1Vq6ISm0APn?Y*I0;FXwKALhb0n?n
zbTq}rUCaP&P%}?M%{U)5zz~eUVHl2cQ4iXUarg`7V{ndnKa^ls;;s0+KF0>wh0YM{
z)s_6KF^&$UYzb<>4^hQbi5>9~Y6U6X%=s-sO?ZVJe}vleyU1EBtGoHlrwb+%&O~MI
z0BQoCqH5`+gNCa3itTsy1&>fG{R?#pB6^rTOhISjEYw8vP@fM%6<Y}^^|S1F8S46N
zsO$Ei3s#}Vb)2W+O5--x!=F$!@tdu4uKB#FZA(<KreJ-1&hGDzTHy%P0HaX@yn=e(
z9BhJX?D!*O3mw)O8cNB}_6NVCE_CZ@-sw@;oH!4akxBRru0>6FJ8I?cBim~oMasZ(
z$ukqkM-}%_R0gJ^CcX&0b^ce<PzH9RJ03vYa0+$9H>iOgqZ>Z8W7l40B3`KbgHa2K
zL0#7dm5EMv+!M7G1JMabV5-jlOEh!}Hlt>C3-zFTsFePKn$Ul-E;fA54B&$eiNkGM
zqZZH!HQ{_a?vI+_DAdFzVhb!qhpPNN8cO*c48uQB0|s-J^uScqdm#t);1Q^myo`GA
zB-EGIEcC!Ns6F3}t??LY%O0V&uy${=z~;TlzuxWfbSTxisB=HWb~5ULi&2@`WXC&E
z89Ic@zzNg@uAttSKcOb>RABD+#1P^L)WovT3kMXCf88*K4h=jDb&l8C@qSdbpGQsP
zK5C#R=#8FzOn-CKb5c<&%|lJ_1ysg{*^b86#3gpT)j>lu-HqDY3RKY?L#_A=JHCv1
z&~4O;@1b5;kFgp0^LkTJbwJfjC)*s<b8}G>>y3?YF!Bv=ImX%-ypNuA?8A6GiJIvj
z*cfB`vO4UHi8viqM0-$g!W)=?Pf!zz?Pmt=japEDR0fCHzJe^oVZCV@)=JdOw%hS1
zsEM3HWuh9DsoMQb20Tz12}Koe6skx&p|)@csyL^iAI?KvzX?Nd2fFM0pP>;<$F-Uc
z212dSd4T!DqaEtT;izIQMjfNM*c?|N<zRh^8qoU%GvQEF=Au#8XQDFD6MgYTbk_NQ
zl|}&0MD5*r)CHSt587TtW#9)?aaE)C)@h&_&>7Y5ff}d@D)lj_txZN9+in<*1?W&}
zr_<1b=3o<i3sp?pFba2KBwj*2=m}~??uF(Q1Y#<20;+#BYM{xe376XaOHi472esAP
z3dz3)+E0fDs=$S{_*)Q15KkOzepR}G?TGzeG}rY(WoSBTtCnLNo<cqNcdSC^Arv&8
zL(0dRJ=FXja1%ALHh&}k<up3~&Ft0hs0TD0#y1;=;4Cab4fq&i_4#m<kqk^B9)>e<
zo!uY8>?4S~U<ekYim(h-Gg~nn&pK#mz=x<kaT;k-6pJdJBuvBZsPj4pbu6o}4gP_>
zvDGN{6-zMz&!X<Lip&Jlu_xgKoP?FAaUJO|nHNb945VWWM&o=;!hOi1t?!XtvGPWn
z6z;}i;yV0L>c?RwzJq!*-ofVh2=#tw`m*WIKy76{HqiNBNF$Vvm8cmVK;3u-pT%D>
z8QYFAr(_J~5YNM0yol7J75aCxWz&%{t@Bud8Dq_{`~dxl4`C0yidj1U5#!8CU&62X
zU;}33H15^}j-v*wKi>5B!aU*?n2Gmnqb8Wt7hwqfYfvk#Ku`PwRV%I&&3_Hc!oG}e
zO{Jj^E@2G1y<+w*4OK)FQCqSatMNFx<ELz7KAuHy41LuM*cP>w<8dx7LLJX0lg;TV
zz&6Cw(6N+8ISr*O=QXnh`%n)&fz+3E9fPpb6qDj1s4XkUR(KhkVBM*v%0qA)aVm14
ztUE}3TUpc0LU&;#@wd~+|8g3x)6H?%g!<q!OvDGMfkH`B%>=NFcnFr_&lrp2UpEuq
zh|dx4#kN>yhRIO6?E-8>{~Zj*hckG99_%^ORB1eFMR}No4qS^>*a3$!svhtzYER2;
zPoN+1SE$TAwEOGNGN+>n_NKop>b`XtjvqK^w5D+hld!>TbM7-Rfw%xS;vDqHs5$0=
z&teMkI8-(7Ko#X<OvNs5nCHyEcEl?&3ooOd8}O$2c6H>^P|;1d-HAF@Ut)WVq=J;n
z;W!G{Vj9++XEK$E+WWDnf#zc~JZbv?m1^(##w1k63oumYzr^lXips!V^uT-QihrPL
zq2613Gh!-gfG?4M)>D22;Cu>W9BxB>?!Ukc*a0=*U}QjR8ph!Utoi-_EDb&28`O<|
zp*uEP$Zsu}gne-V7U6f8gS{3}h`7r33C0l@E;d{G7G@G3!2?)piTNwK0=E$V8xyEM
zYr)%m0qH`F#=1-Sdk$M6WnnEqeeSi)Ot2qn!qYJlSEH^!iYm?!j+7RVfLeJbj=({v
zqN_qTypIkQ)ngiA=&{1QAd;|<xDd6s2Qd(@pi=lNR-w;IbKQ0HAWmInegWx@HG7Pj
zPzicsDe5`P@p&v?#r`*^;j-GSED<$eKl}v8V+6*o;XgECK5FI8Yt45=Gi*tmi^(_{
z+u<J6sd|8_nXq-{*Yl(3Pka?y;D6SUe>DQRN;h;tT`<Ltm!WFn6l$VBV<7r&Fasu`
zwy+py<Byn+CGVJwR-vBzZ`1?>H=64UP}g5_&~T+O;9aw_k=U5H6t#z|Q5pCLYNcoG
z{%Tw2P39HrhpqU0DrVp=)RugYB*FR<7vQSR=DiWM#nhT(2#t6?n2&9-0`+3~6&b^d
z*~)t#&!Hydwau&`47C;SqBkDKes~e{FlM`{rKzYQ-GaLAb4<fK$aVbv_Yd>;dNBs^
z!H1}fT)@6~3pH@^4l`gjs+fjiJ)DSha4KpcPCL!FUJ`2MhjAdju#0a(+;7`;w@wwC
zca4Sy41UiPPYn7I7h!FjiJ3SXd*BKDJ9@p(wqYsm$D23-SA1Y%*F9v7xC-5I*<SPe
z#Aa+qd=FDpJQ3yQom_}-5-&uKyyf?yd86&d{=~ui%zI!mzCnB#wKdrsjTJZ#$70yW
z{7r#xV*_+$cB&~K496IZ!d~czrZJg@X1EFUqS=euipS`SKAgoy7>jy9du)M2F%HYn
zA1iFHpq}>&`r%)8?03N2-yHqv?|y*%d(#+BM;N|lyAD<LM{K`E6_Lw9^S}huM7p8w
zAA_1uDXRM4!*u)++hbIPsrHdLfp{@$g7prOf33jhkoldhGqxcfj(NBSv+)PiN)iv7
zOms)R2?yfqI34xizfc*S@Tn=r^{D5cL*4%rb&P$FnDII}XvEMl3{@11Q3IbvrM&4;
zlZjTSl@?$#EW%)1h|0wKs0>|1FRZq8KW5(bVdzAEJTAZ_oR5x58ue-9RhnYyiyG)f
zd=@97QneqI;?FPyAELI%>$oumbu0@}85oOAaW#hFC-^$vz%neXvd{kyGzQX<e!|?i
z5_RJ-Ov5{<;~DswS#h*&S4^V62vwx(Q3HR3<MB2IVZlkWH6^GC-otFH#z>w2j;G8D
zMqwf!l%Z011YPhFcE($%fg(<uOtixc;*qE~=N62`8>lUHIb)7(GUgC3Ms4vm)HuGM
zvjE1oy3tUzI#9)O5M%IrTi-9t0G+WT{ZlX=523DmfZ-T$*3?V~Y(U)0wm<eE9*XX`
zAGMIru;%~&yG6r?jvrA)SDV+CYQPJXvMAI*>DU!VVL#l9PWa4ub6-PrCl0aWR;Vq=
z#0VUO>#-Cy!LWal{}382|7rfn?18Tm@4;AXal!nx+7F9~&toQLTr|Zw9bX_miZ5f(
zB~vT&F_d^EYT^g%_#P@#&X>*CaqMOCuT%`DLo=O*lW`3;LZ2(<hDZz`?uOnt0=wW8
z%)&}cM(3;MRo)TfiN~WdxEXWtW7GuderfKHcF@py9*0YC1x~~kUzrKKgF1$LP%HWk
z$7ADbd{g2)^uP|+&BUI=IN}j@ybS$_cVHw|q89c&CZgjB4eeRn4fE#9z+~d_n2tM9
zdv_0g(e-O{eFVA^x3<kh-It3&I2*OFO{h$q!tPj&8ZY~1&HWCm4~_P848?l55p~0M
z?2BKaULXm#j0LC^PQoHwg9%vow)x#L8H0)QQ5h>iO>`-0AsbP}cLGy2;yD^`KaB_~
vzaMcZuKaZG<1TKAvGED9@ohsAlG5T^m#-P*T&q@U`If=GUMkNzo#Xp|j159!

delta 9628
zcmYM&2YioL-^cMws6<3W2qKC6GsFmqB#208jM%dgqBUaHPD8As7qRc!t5m6a?Al6N
zvu4f2-mA3SRc+P0>Fx1+zRvY}J$-rQea`t`XZ_CaT=}Qd4i=nosGxnzx6lHM|5~_N
zRv>2ks`mf?oeH<C7^<f+4Bui^469(CZ;R?O$f=J*7xks+f%`BGf5HwJ6k%Bjn2oh9
z%eFRAc#nn$_&)xD?pUp&WfjDlSOyc2e^xtwc;YDZ#);^K^RN^yNB&tmoc5cj=N>xs
zSE%_4SJF5(o!=Fh1odDj7RMOW0_vkWq@Whk0=46wsON^G7Bm?Z!8sU;o3I$3MLmBT
z1Mmr!L+{F#70diqWeP>GGwQ)U=z*h93(7(5Yz{`^Y7D`1sEMATj-*T#%kslU=#L*_
zVa&#&I2wI$3cBMWw6&w<6bj+@SQ7U-^|PqZUP2e%Lk(PrRd`}~B$`%b<e$}!AJuUz
zYC)T@4qnGvSeiyfvK6X-YE|N2jY3x%*n~A5wS%455l^8O7|ufqSrV$=5w(y^48m#7
z=WCqL4?6X0s0cpC3Ro!0M5GF8yqGBBuTZw6fn%`-BMEMOfhBMc>hnC*gpW}R@Qk*s
z?ih*+@kG?^_#Cyf&8P`>p^o$-Cg8tO<Ao9?9YrIXf+kAC`uH)jX=@!SRF|+A-oP68
z5PdM1JE?0~ogZG<1C=A0sOKkQQJjknaT)5U?xJ$WGu9-lU5$cP*c_9v3u?eG(Hqxb
z3EYVq@E8`y3#jY*3&vqMKa@M^s9YL|!I*`L#2hS-8&C^4iA2t}{-mIRpF0*{o0^~)
zYT_W&(L`f2Oh*m40yWWIRR4phh3BEN`#KiEd#Ky=2kPivpd##DQ|+98A_axC5$gV?
zp(YrD8ej&h;}@t<Zbn7sDV9bzQd>LqN9`~HmCWg=v(7;+bS0L>b*T5iK`h4n)-4Kt
z_y~Q`E#B<J4;6t>RPxn8EwnXiqHd^#eui4mVpQ_2MfKZ`%7r7Se&<n<{l%$2Lt7zx
zj~B6a>Wd0xAgV(p#{^U|Hpep97Kx(O7fa((tcTxWDSV2gh2=rYYeR{s1+_*kGy^qn
zW&-io{T)MtR{kYw#jEh$4p7(Y2r7F|VKsb)q>B|=$ArEEMo=H_xD+++VaL0uh*^o2
z)dqr55zkB{{;eoXqCqP=kMFJtYG<BY2~8M+DcA<}B3Xcn#BS71&Z8E52dm%{RMG|2
zHD@1z+F&GVyjrLT_p&J{<ioHSjz>*A3j=XAYC(rk6a0<}@f!?4U*evMQK;u~P!p|3
zMQ#Ub{5_~7Jm!3U8g=CM6$%>YE-E?x7qv3)_f5xOq{)gzEucR(!!f9djymmUQ6asD
zip(nv#}dgV2WlZ{VKqZ{%t89w*1srd;svOMta3bnC8^&;MdEMNbKblr%VK#{J>ID|
zK_y)V^3R&b551BvqBisj)z7nmSzs8(yu1GtlKEf|>dZEwcAAUI-s7lH-9R1DeW(2y
z>Q=b(Qc!4%VP*71Z6pabPC6=5{gG3%hG8OZ$3UCHUlg=5uSRB~3aA{2MuoI7Ds-Ju
zNxA?v@k)%w^{5H1q0anQ48cdJqwpqkm821<{&A@O4bWCHHKpK>T`&kopw4IkYQUu!
zi7T-Xo<T+ABI>!@=!Oqa3wnqOdAY{sHbi1|>K)L9Q;^_UYa0`PuBP=n4dpSSiJ2e;
zweseu756|*kcHuxjbXSLHPBv+LaV7|eE`uIhdHQZ-H9Dg6%Xi$F3e~~{8boFgF?0f
zHQ`}YGM&fzSh%^_K~vQI9fex(8mE2~b>`2Iy;wdi%r~Eo7*BmJDsm@K3&=<1(iNM6
zviQE^3+I8tEzM4gqi#VB)EPF#BAA9+XgAd7gHg$rg9`n8r@jjHd@ky_1L%ntQS;h&
zD0oqLjD_(HDkloHGWw%Fk8(^zC2Lc3$L>yhKhzF~qb3-QnqV?&yoFc}zjf+Ikt4LN
z>l74{x6TJ1t<8f$7(sh&tccxEXFmmt;s(@$zenwSKXT00StK2-a&624dZ3bf2r2^8
zQ43#=rF8$-QqT_fqBovEb-0S^@Dw$Xds}m6-l%#YY9V2${?Vw7Bw;a3K}90fsdq&k
z#Xu~G!!bek|5FOO1>d1o_7`fPm#C0h?aYGS!}q8Lqb8_;#WBvYA!-Aus0H?L>itj)
z9Es{T39H~dw3X%iDClhd#!&R)4k-fBr~#Xy-V5odfrq1ZG8Q%P6x0iAK9<05QD?pv
z<M13RQiW5^5&EJw7@tb~^=?n5p(J)e-TN%ZX{dYt4Qk*cs0dwl>bFq?{f&ymYt%wK
z+nYCM2x<fIsQ!)7h3QxdN3|#ZB`M6LL9f~ss0DnFy3c2v`Xf}<7fLe&1>w6_G?t>h
zvD5w$`cWT*+VKR`0%xHjx5)8pjHABVb{ejsR{AsQj31+t=LKrV1$cd_UIaBzDb$Vw
zP%o}Xtbnah$u$&}J0l#&pvE1KTG$lyL3<tr{eEBRJa7+vssD!6@xQ2*R_kbX+#M6B
zkHlEqhDxSiQEx<_bn}NvG-^TJQ4>!=ZD0oKC>9xQYdr<+WRK%1)XHu+^*>Mxd4q~X
zR3{UuTBv?0sEDMYlDIRz`z3}t!Ud=#-HK&#AL{wb=+gbaMM0r|i^1sqp{Ylqc32lH
z;U}n$i&06t9Ce-cVnsZOq>1$uHDS|_%!1RfH1#g1=d)1}$iXtY|MMy6I&HuJ+=)87
zb65s1JO1V9-q|cL7?oU6s1V1aB2?FDPeD!88Ws8s)X@$=&G#AFl_^Z6ppM&61MR|c
z_#-NruA?Gw8za!8iy0^ywW9{8ThJC0u(#9xHEN=bs0ime?MG3OywHXC>#VQSpot!#
zCVGss3h)x@%Kr_azOI}3%H)$_{zz?!dTtsjLfcSBbpoUC4Qkw~-FatVUEF~MdvN#h
z2PCg8-=4%@E9=*j?_)R;byih-nE@JNJL>ImBCbYF7}?u=4`_&rNEX({MVNzUo%Z&u
zKAie!bm4MT5*|S1%r%=r7zMYF&4dxCBZ<et*d4W?zE}rs)OFp3x|Xl7CRXcf{toDg
z&8g>N47&9*{c4~Vn2D`%Esj9@B?W~lv%h(fjKe_cE3h)|#~Sz>vU#ig05TaTphEaF
z4#e90Q0P}-GG0LCgx?^u(<-R<!w0DLEKFj4Ycd578V+Fyo<c3?PppV<u>n>bOjNKx
z2H*;8iu<q?x@U6tF%5NO+fWND^a;QFF$=x$7xc%!v8C>R(Jb?~T{>!~%kU<i$Huso
z-dezaP!lE&HSH6z4fT_li~-rk&KN^|DY`Hp*{SsyeX-gwa}>!~OZR^ig^swz`M_hi
z`9Bo(QD;6Fl|<`MN0NuH@jvK|PdUgB&~2m%Z5nFA{uqdBa2g&)UC-8|%<Y+qc1;?#
zQkahqP$3)hsX2n*uoU&zNS;~6M?0@pY)5?o>c}2oG!_|S-Wv&6mU??!gM*NZW%-RY
z*Lf7yrhaEE@sFV3{~2EpF&T9mE~DE2!B`9>OqwVSgKz}Szy&w~!^WBGxCVWwUqmhN
zKGwq8<4uGz9S@?O^UGm?U<wgAX5hwHo_a6TjwWCVZpW|i6~2!PnN<T^LY?UY$JeNx
z7n^7z7lHab5u>m*rs7zq{j5zPjD}w@4m~EBBuv86)U!~@G!?(WUFeUUCz}C>qe8g~
zTjDKLQbtZOXFVD<&JIk%Q<#E9rkZi>HWaGUFdnPoHpknjYvo1e)WZ)^p<Il8@eJ0%
zgnyYxWn($&D^U~e#|rpg$I#DBq?<bSMUK+8rcwyu!PTb0I)*i<-^UUdFx}kSYN%YO
zgUfIbY6343fua?Q0k|Kt@H*=ARx{1SLs7Xi4>jLbjMDu-PeEDkHp>i92GubRy|EK^
z!oH|$dJy|zx!LA@FcG^`KkXPj#~jTZ)RF#($@mO+Va>Vbuj$9QiutX;dFCt*Vk13>
zl`(-k*%f;t>0up2ecoh&S>SZkj<;b1=AoW{jy~9aq1ixh)XuZ956(s9+$*$;Q3(3N
zBvmAaQcuB3*cZFt9MswVg@Nd~$b_&W9--b0^<44A=Ew%22Xz}Y@l@1;R-<l1E^3?;
zi-~^+3J++gi1ofSJL`j*a60~gYcL$UFX7t}PDbs#?pLN?Cyb;%9^-K%CgHEBBM4n;
za;5|NQGbs9SaccjuR@^$8714II*dj=u-T~}N9DvD)I!6)Halp6ny@c2l(ifup=-H$
z;jBhQ^c8B{K<==fZ;N_<s!c&1JXV-2pNZPp5-g3ms3gooMc^iCr*8ja+M^unVo%yz
zVl-~Sx_AdmVEL8i1y&u&ck49jy<vA=Ws+?HR;OV<*22fA2P&@SS1o2>LoB$)Oxy&u
zgAS+#UqaoYCzy`zYt4%&1C>i#P)T|f^_;ct-TT9~{3x`c-WHqSaty+MqZbxlZ?0WQ
zR3rwVCj1nYObf9vuEWW=1+|g*Z_RJLzDOEaPp~u2+F)6;@zFck!q|=GT6u3W6Q*Jk
z4`g6jT#9bE6O-`=Y>BTi6Ps-2?TESfJ^F6ps^LjgJ$WnN0q_-i<MD0g`@|JYQV0XK
zn^31?4D~rU6%Qd--fH=sd87S|ov5eoFbm#@Q>Z^d9nGg)4Q{Bl4?n>UxqP9;pU?x7
zS&ee48HQm7+Lb6wq)-_*qE>hr8{vJ_QABbF%V0C~!S1L5hF}$3h*5X|{qeD*=Pol|
zIF_Y7&Z)OV_5WxWDWncI4W)1~hT<m2vlveOnWO)1lSK7U1NKG@^ckxE3e<vfQQ3bN
z6VbKD{1WSo+UOF@#v^-(zjj<_uh~H}bWtCPHE}Vv!F+6t!TZd_eNd6GF$8DhINXLB
zIBvh0Xf0N!ehw9(f<K!6v8Zd@!lvM&FaoRMB2@AnK~3y-z)bW3DiS?WJDrLZa481k
zAyg#pp{|+xLGwR0q8uBbUiBTYAojwUX!oV?Ifa+#juQ@<WceI5(R^%x>rjz;gbMLL
z=)#D@W?@Yn2coX!98{=RVtLHNQ2YbOq0f<bU*T+P4h8Kr_^7#`nW&DZP#s@j9rXLj
zT+g<s9d~gYi#4b(MJ4GuRR4!K6iXd*ehFbV_0^~a1{~Ls+MEl82pWcAIDUn(cmTDq
zXIK&&oiKk!r(+}PJy8>`#VYtC*2UjZZ_vso&6m;))X~nwPPiMJqTea!{&%II374RD
zl84ILf~QT=ypL6>4|ZIFn&24L$G4~?tDk3{8-iifzeXkLA@sltjyExl`hB#$DJ12a
zowPtN>OIj9KS2#J8I=oPphC9+wV?gj3?E@S);eR7YZj{CJk<Cro%(hRqJ9_^>APo$
z|1t{hXUz&%ql@}x?1g7=B-T7<Lb(Y?P``l#vHf}TN<M%}Qnw4dR4@ex;Wwxa6~Ab%
zX&`Fh^_=>Ei=4kgHG_tD+=@EW-%u+paEU+9Fc^JsG3xpC7=U@G$UMX*_!d*J$z?O%
z42+?E1gqmqR0JzsG2gBeZ3-H28ft)zsC)e!=VHKB5)(I}77%{T?6f9^P#=lP@-Oi_
z^uBI>-ycFP>>@_tL#OV4!@Pi^P)Tn$p`d{WW2_obXSNM%;sK1umzaprH_h1%z%tZl
zqn=-j3U#jIVN}1f7=%S`nT=IMMWPk9U^?qF3L4-9YJjU)5AS1PtZ>_OsEQq_cR{^K
zb~s)^MerZ&hrxGD$fsdB>bo%*FQFp#0yR(BpS6+FOh7@`qd6vED$e^eJZSsX@V!yx
zT_gGp9O&xN+tsW0z~0%td%5~#4sms-Y1q)-LxygjoqEEvSWLB;*lMw{u9$>6)oX44
zxNDID1!`~4>ejZu*UG&8uKe+N8}cXT{V;FrxsZ_QdAsxW=TFMdapg}`A#aB(e+o}*
R%AY{Pj{KbM`;Rv-^MB=+cwztm

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 2afe1a0a..366b1dc1 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "installed"
 msgstr "εγκαταστάθηκε"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Στατιστικά"
 
@@ -45,9 +45,9 @@ msgstr "Επιτυχής επανασύνδεση"
 msgid "Unknown command"
 msgstr "Άγνωστη εντολή"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
@@ -312,7 +312,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Database Configuration"
 msgstr "Διαμόρφωση Λειτουργίας"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
@@ -357,7 +357,7 @@ msgstr "Επεξεργασία χρήστη %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
@@ -392,7 +392,7 @@ msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομισ
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
@@ -492,108 +492,112 @@ msgstr "δεν διαμορφώθηκε"
 msgid "Execution permissions missing"
 msgstr "Λείπουν άδειες εκτέλεσης"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "επεξεργασία μεταδεδομένων"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Σφάλμα επεξεργασίας βιβλίου, παρακαλούμε έλεγξε το φύλλο καταγραφής για λεπτομέρειες"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Το αρχείο %(file)s ανέβηκε"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
@@ -606,175 +610,175 @@ msgstr "Η ρύθμιση του Google Drive δεν ολοκληρώθηκε, 
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Η ανάκληση ονόματος δεν έχει επαληθευτεί, παρακαλούμε ακολούθησε τα βήματα για την επαλήθευση ονόματος στην κονσόλα προγραμματιστή google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s η δομή δεν βρέθηκε για την ταυτότητα βιβλίου: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε στο Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s δεν βρέθηκε: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Αποστολή στο Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Αυτό το e-mail έχει σταλεί μέσω Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web δοκιμαστικό e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Δοκιμαστικό e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Ξεκινήστε με το Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "e-mail εγγραφής για χρήστη: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Μετατροπή %(orig)s σε %(format)s και αποστολή στο Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Αποστολή %(format)s στο Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Αποστολή στο Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Το αρχείου που χητήθηκε δεν μπορεί να διαβαστεί. Μπορεί να υπάρχουν λαθασμένες άδειες;"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Η διαγραφή φακέλου βιβλίου για το βιβλίο %(id)s απέτυχε, η πορεία έχει υπό-φακέλους: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Η διαγραφή βιβλίου %(id)s απέτυχε: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Διαγραφή βιβλίου %(id)s, η πορεία βιβλίου δεν είναι έγκυρη: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Η μετονομασία τίτλου από: '%(src)s' σε '%(dest)s' απέτυχε με σφάλμα: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Η μετονομασία αρχείου σε πορεία '%(src)s' σε '%(dest)s' απέτυχε με σφάλμα: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Το αρχείο %(file)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Σφάλμα Κατεβάσματος Φόντου"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Σφάλμα Μορφής Φόντου"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Αποτυχία δημιουργίας πορείας για φόντο"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Το αρχείο φόντου δεν είναι ένα έγκυρο αρχείο εικόνας, ή δεν μπόρεσε να αποθηκευτεί"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Μόνο jpg/jpeg αρχεία υποστηρίζονται ως αρχεία φόντου"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Δεν βρέθηκε δυαδικό αρχείο Unrar"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Σφάλμα εκτέλεσης UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Αναμονή"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Ξεκίνησε"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Τελείωσε"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "ʼΑγνωστη κατάσταση"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Παρακαλούμε λάβε πρόσβαση στο calibre-web από ένα μη τοπικό εξηπηρετητή για να λάβεις μια έγκυρη api_endpoint για συσκευή kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Καθορισμός Kobo"
 
@@ -783,7 +787,7 @@ msgstr "Καθορισμός Kobo"
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
@@ -849,7 +853,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Σύνδεση"
 
@@ -1068,41 +1072,46 @@ msgstr "Επεξεργασία ενός ραφιού"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Το ράφι %(title)s δημιουργήθηκε"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Το ράφι %(title)s άλλαξε"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Υπήρξε ένα σφάλμα"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Ράφι: '%(name)s"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -1183,14 +1192,14 @@ msgstr "Κατηγορία: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Αναζήτηση"
 
@@ -1210,102 +1219,102 @@ msgstr "Λίστα μορφών αρχείου"
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Εγγραφή"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
@@ -1382,7 +1391,7 @@ msgid "Upload"
 msgstr "Ανέβασμα"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Κατέβασμα"
@@ -1549,39 +1558,38 @@ msgstr "Λεπτομέρειες"
 msgid "Current version"
 msgstr "Τρέχουσα έκδοση"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Έλεγχος για Ενημέρωση"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Πραγματοποίηση Ενημέρωσης"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις επανεκκίνηση"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να κάνεις κλείσιμο;"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Γίνεται ενημέρωση, παρακαλούμε μη φορτώσεις ξανά αυτή τη σελίδα"
 
@@ -1594,39 +1602,39 @@ msgid "In Library"
 msgstr "Στη Βιβλιοθήκη"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "μείωση"
 
@@ -2471,12 +2479,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2965,30 +2973,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Διαγραφή αυτού του Ραφιού"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Το ράφι θα διαγραφεί για όλους τουε χρήστες"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Κοινοποίηση με Όλους"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index aaa84a38823366c0be19402b88b798683e733d90..0ed8ab6e9bb94fbfd135e75d01e100b8132d942c 100644
GIT binary patch
delta 11062
zcmYM(37pT>{>SmJnK5R@7|hOWKW1StE15CY$-a$!@W*7NNeWYzB7B8vLav4^A=$~A
z$yO0=h+GkW^0$S$LJ{>R+x36Fo%4A7@1s1=IrIIV^EsdMIbU%nf8f1fmbZH$*ylrs
z|E=|MoM;>zrr!VmZ+#ud$)LLd<MATaL+`rg`E(4X-`VyDqKEzjOv8`S507FmJdOF7
z!X%9x$91OC$Yx+SmdAV893Nu^Y?{Ji*cv0SJ=VfP48Zp=2<KoRF2_*ZjCyXr9seEm
z+ymS9Pt|&^<Al@DMA6n-7(_o4D`PGyfNrP&d!Yj9huZl_)N}8k=9!Di<Wj7OyRi~p
zLOp*AqtJ`=1hT#pOQSm0MLp04GqErF;|x1K7nRDj7=&9;JKc*N@e~$d&2-1<gl{3)
zc8+2Ve1Hlln)3|D=ID}TC!dCneF|2?1?Y=qSP{R#DtG{OB&SgsxQN>EJ@i2@q7K0d
zsD2dcNIdAl6x95AsP~3sl7F4iNCp(?LL^A%AS$rGF$WXtJ5EC!h&qCKs0kJ$$LXxW
zWITmW>$id9^rjz<3UoLs!|&MsQdA&28<77P8Yk=nx9tOg&zKhyP^oT?I<q`X#G$AR
z%|cB)50&CASQ}4b0zSs7Sd-}W^9HDe^HG5nyEF=El-PmmsENI@%ysie?KB0oP&Ni*
z4{U@*sEI#89nn4v#S^IKenkcF5Oc8-S52Aig36>jo`$M(GO~GR7HXpX$gw)7P-p1J
zYMM9<^?V&vZDeChY=t_?5>%0GM%{uFs6hU}Cg{z1YQ7doW?iQ<4Mo@=HQ{iqjN?$>
zfoZ4(4<pCx{D>hK*w_@A2jl1`Vs&hdu{aPFh>ObTGSvKQty{6O?*CpI3g9^E?5<#Y
z3?y7ln2&n#Ra8|^u>HxXoy<htiiN1_x*V0M4XEq74<qn9RO+vwinU5pGRFE&4h=mx
z2(`19F%n%2$N8uu*@V%!2Nl?P)PjGb7Vv6jinTiGNRn-T7;2vJs7%eqSS&+Vk^DeI
zMf3=@!`S8~fOw3e-vo68eJ~7*tm9E<TZ+oWN>nDdU^V;(wV?~B4ctL3?A^j_pk@p5
zuj|#60abY?)C9dz3%-PU@pV*9l-T}!)PieK8Q6w8qCKeRk66#6s{AG@Lw}))JdmrP
zjO6CJj>D#%J`BitsIxnTnRo-Wlh|j?PP0(~c0>g}02Rn97=vR`8<~gNz%tbHn^8r$
z4|PipVG7=MX{f5>IIuYEfk`;h`Vng4z1EAU6h6i-7~RSo$t&2I{$x~O$50DhMD4Uf
zYqMZ1@{iMrUlP$RrJ>a9K<(rhD&q542XCQ@vw9m-8}X<e)<*51J}Tvf$j8ok4RsW2
zusnW_%ET9_K)yv4@kJy+*Lh@rkkHmd)EJX^pb#~22`ZoksH0hjD#|_B1J7YCOmAlv
z=!5$C2-Gc^Ze4}kY-cZO1CP;H_usF*iMTTQ@PjC;2lZeg`eQn3;v7^l=A!~ELhbl<
zR1Hl*1-uXW$2rL_nkTk{8Ba#tqQ)4+`c5|*x+Vir#Wo6c<}*=8vL1CrJ8l0sCeXit
zx_;gr&3{3KV+HzMFaUd_0v&`3{59)L)Ow$y%fHTUe(8+?olL}oP-nCrHNhd&2kDIM
z-?4o!Do(c~3b`mw9#SsOEL6a!um;}546KsJcORd{c$|_){*}Vj3}}HJs27i;Ubu!W
zFp5(5!~Uq$zJS{K>*$ZuuoBL(<I7ORw-t4yUt%)uL1p4PY98ON<X@?Z?8-+7<55LY
zh|0iXRA67A7CM2d;`698{0p-&pqsgNEl~@1$29DNn!f~naW+=Ok5HLe<<iiOzs0Kf
z69(cP48kX<34^+u>JLTLNHVHMTB6Rp5VgQdSQm>?J70tfd@1U=b?Aj<r~ut<G^)_}
zH)_ZCP&*6dZq>m$n2x>BgYO{UEN3<5;C0joDY2(nuoY@U?NJ*jL@ij1D%z2#v!9R5
z<2ql_NM+y&D)p(oNFNTx`nU_*<892x#{3e3rKrGHp=x70dT@{R5-P=By-gqqm`T4r
z=3)`X>;A8yp&cH<6nu=@QQbbK-vL!LZy?_)XAWxTXE6)I`<k8Sp#tfFD#rd;8HZZO
z*`H5CWnwml=>G4Zp))^%I;%6N)Lqd7cn4J*zW-%*9Es{Dqn>Y!dagC9*!rRt9*mlI
z6sk7f!cZ)+E=E@mY@s2)#z;JZDwbdD`0uD<dVpHs395<%`kCj$Q46M_7HE#uv8U~i
zK%MziREE~r@z45^e?54Bfh4?ywa~A>Nl`j#p<bvR7ov7D()Pz;JNh%QE&ewukeC7H
zmZYFI))tkao~VrtK?Pbofc)!$w;52%OR*X*MZNGPYQgVq{}k$MuiNpzQ2{<d%~P?!
z>@X7bTn$vl(riBmb!6?(8@szS8qvtd9Gr!U@H<qhPM}hM4i(rX)c4>aYJqaknH^WQ
z#-TQnhFYi@Y6I=;co$Tl1*rGkm+b>%QTKfk>YA)W9nA%-iT6<xMh`TBB%u~+fic(x
zwa_rsbE8lTO~i1Vjyl3+sMLRs^>zOb(NGE>qppR2q1kyVM$^wijrT+y$ykiQ_pK{Y
z6YoN0?t4_mPTTQws7&5O)y6$kKoth*L+5hWX=o=6P!qL85B5SuItI1ybPU5Kr~tNN
z6#mQhuc2;Fx#!J1)lm!8L(S9Dj`u;$GZZVbzB7r2BAkIr;fI)vi>wDQjs722&tUTh
zm9AKm@v*3*TZDS=AbRjN*2dr$%)E_}lsnJb{up$%^9eM{;|x@_mZDO**!EYV0^5vA
z;dZQn2Qd+^VG33*G7C3FWwHRhu^3fsqtFK@Ti-1r|K%B&!GLO@6g%L@sBil<Y=#d|
z&oz3{{J!5D^~vsz+R+qLs<)$V(@|6r`wcOfX^gS-i!cM<Mg_io2>I8<=NZt>ub?8n
ziQ2&(tItbj=i$~QRDca_zbz`D-dF)kP??=&f4&5L>2E^as%@xSbKIq&BD#f7KOjR*
z5k;b2$UqNfqbBT&aX7^GOHezVhqduA>b*Zvx90&W^${<dFKZ(9q~95}p1X{OBHn~g
zQ;2%uC@KTzP}P1D{n7Uo6L1x4J=B@DLp|5o`hs-=D)0}{4_BZvz5&UA>y*(@0LSeE
zXHXMfMg?#c1Mofuqt7rCNCYO+uYn4@BWj*Os0D_iQeBKX(&?xS{R5M52L|i@U!+lq
zfjg*s>I^qU6owk_g4+22RA4V+5Wa%?`J1SezlW-cS*YihT34Y0SceK=6DkuwVvO$p
zB{lE~t|~`+g!!9~Z;H(eKChbMN<k0L6`(TVqIOb>ns_H>;AK?CLSN(Kg>lF~&Rl-U
zLjRHGKU#Cq)y~Gz=z>#GJ2{C;<yq7MSFk<?j54>N8R`p`XB~{%z&LD-^HE>Ilc=Nl
z9fQ$lv^kmx)cY}`$-mC1J_Gu&<e?rcK&9|iRI0|Hs@_FSxCHgwHq?8EP+!6`sDK}#
zsz09XE07kLfPFC(Ct@9(J%;>;(AdpDNBjY`VC?JW!CI&cHNmRb1{H80)bk^e|7LN%
z#=aQ!hM9OY>VxwM>Uw{Tdhaae;$4i#Y<H~r?X*9tYR8~<G#<6X8K|RJf|_78s_6Ei
z0zHP|cn0<UAE@{4Vj}vFGw-FLHqZf6u)o!vMkAAf9oPhKSZlv&#$Q0y#C%j>OHg0B
zO{kjq39Dh~cz*B4RIHARFbcP$2Txf4!dmphCOrMQ>oheDr!VRZN27KyA8X(`RCWIg
zm5IBkd;cHQ8P=X?{#vaE>g*?>0$PoFZZB%y8>kx6AGx_8PAVqo{(r*1O67jkgh#O=
z-p5!hKgm>U0=A={gG%ib)Iw{~ga1Sw#m^Xx53w^wzGeTwfy(3>48l#=i8Y+vG_>Q2
zlTFHFQK{~RN?{@D!!iK_aVB=hg{ULAi8)wviV1iC)}%ikbyQ1GReuaM&o8K=zl%@r
zf523;U?{fd2MMSbhGSQpf|~FoY6tgF6aNR5iL|%P5%t0}`V&#lZA1mU6}97ir~r<m
z0=WD(`Olznmw~=m`yI1`$*2dGqRxCPYNB0O2@j)=>_^m>?h-2HzoD+H|GTCLL$DtG
zRIG*lP_;A#_1yY*$$uP;Z44yfDOB}7L>)<ZiTQalCem+@dT|6QBV$p|EkYg1CRE^F
z@0mY_hhrxFXR!&6#%FK~*1%s~8oo3FrkNtDiZS#vQK{;RD#Ak4M3XQA%TV|EJJin4
zquzUfD$2;|<^z+7I;wos#@<EEy9@)+Eu*0qc4HX+X!|#9-*1Mg>R41wJcD|!11f-l
zr~qF>1@Zxw$BlOUa~wkd1nPD)dEeAj56oqKX9W#S{BLZC4^b0k&NK^kLEVNIP(?Hv
zweVEbj^|=U{2YUD59;UNV+Fi~weT7?!m9r;ne2$Qb^j;Q$l?d9u>oF0)k5ejV<Xhr
z7vOU^6?OJMV?V6$fm!f*Or<{>_45_j84qGR3@bIaqX1QNGx6!4|2NX8%D_IXhbK{I
zQ*O4|K_CXv55<lck2<mus0H4`%6J;R@hVor8yJcAQAZR!$9#w~P)9ft-P$zXqoEXS
z!7BJasDN%@C_YAIB=|%A&k4-J7PuTW(a)HS4^TT#m}@fD78UR?)P{DV4}ODzcxW#9
z*BPB+K)2w6eef4lAb+3&D>u(9l#Jo@o1=D|j|!;Bj{ksz=wGux?=;_B&;F<{=?L4O
zj;fuH=X3r_%~uTQOwOWG_YmXJe}M@k1(ktjsLVW%I@8gp=Xaw5JAxj(g1X;6ADIm#
zVF>*^%*R1E5qG*YdeX>VXsZ5w45t4nDxh7cBRFsScQA*3@FEjHXY5LUE=J&0RIxrm
zu9uUz*!+p=MNFr^1takaYJT?-4MiILv6;9TYG-3nN3svA;UUzKTtOY#U#J~F!dMJh
zV(xt=`q9tEOw2_sJPNh&O00;xv7he$VH&*|NczP5{yh=n=&wYjdOvDMr!fg1qXJA=
zY9<_pdhQ);it|wcpF-W5KdetMjegKFGhZ`|(ET4wLlcZgrFtf62g@-A*P|vpj5Y9Q
zR0e#Pn+yeE8~S1BkNr{e6`|&N1HJGqY>!h>8$5~`tnb{Up|kU>Fn@iXjcw^qM14>W
zpsvyXqRu*ZrO8AoDv+I69rvP&@f>Qw>sS|m$NE@p6$OZ$QT;{ewxDs0MqjMD+I#_D
z#%}aK!4kZKI=eU5m>QUaI>VKyi9W-c_zT9P-&(Vwdf1qLE7Zc1P_^(qHbm!B@~=kL
zr)GlT*p~hWn1pArJv!_7>l5f;or%8mf3TiGo%K(s+j9$*QLpvp2&$tp8IL-e?x>?4
zyq^5~(-_NuzGPD{3Kv+nqN@Bj>i+(UTKJLedv7ocM4;aHpaN-VZH=0*r?nWB$r;v_
zE)At@H|oX9sK{@l7V_U{#;agO`f;f1Ru{E{4z~Xsss<+7@dc=iZA3r3gDT>OsDQ#Y
zncofF3>vi=c-cA!1L*HUrSe-;AZJk-xQwcmyVwJ}ZZ?6ez(o2xQO{jORr#N&42OJX
z7LLIx^cxvnrvnXTpdaeGxmW=gqf)=p`W2R^e*%@lGj{wADii)&O!dd2Hc$_>P!=k4
z?a&*0Vkhi_y>$Oq($InrQK|ASGyOo!pdV`cZLl)^JgkZZwqK0F^e3T?ZZ;}o>rflm
zVm*Wk{3ldE_pyoYfBDbNxB6MELw_pP$4yuXuV6IZM(rqQt2yg9)IvF^33D+7JEP9J
z5EbZ~s55^bwV}1B=gy+5g>KPM2I9Aw`(GC`=?_FbI2%=5t5G}HXUETCApKjY_aC7a
z^4V_2J*bSNU;?&A%`+4=&)eI{e>jbg8A!vesOtU&wF93WrY2%hpWY^zj0JYQ1oiwX
z)I9r93!Ot{tlUnsP%NsSg~~`zROX6yl7BUZF_4X;un}&+W_T5wW6~EUGexKc7Ggcz
zgU{gas13w_Y2NRFn)iKdjB`*KI)*{`qwQaHX{e}fp{~gj)S3H#WhRI~9YHMWnr31u
z_QN(f4b$;BRzt5{rplvH8S$Xz%|hLtTvT9fF$Uc{8pSkTK}B{R``~ZrgROU)>(v2O
z6VG8QEJZDN8k^v4%)->KO}_|}=r6~*co>`FT~sC-?0I?=uG55uBFn>2>}h=oweyLn
zos^<7uoe~Q52!EPB~<k%?lspi1NB}j)Oa6^!NKUk$*6gjV^!V%BQ#W07f>G#zkTK!
zhF}E!W~j5yN9}kDDg%pAXMP!VWWoP5zlnKJ{g#-5-S9<pQ2|{=W#CUtWPRr$4ehAL
zHzot=7)if1Dxd<?4qn1Id>1vrYK+EBcKiq`z~3+oefOJck48WGshEgawm$$}{h)|O
zc^rY&aWrb-Ss089Q2}j4)xbg2a}Q9(6?VY9ABPGs5xucB>g?NN4vt1;bTjHh_U!@k
zuSm}@&;oDSAEX~N6X&8Y;~h~M>W=#06k-J&j+$_c?axFX`g2hMEJS@#m!RG|j0*5H
z*1&rQz4*G_tP@jqrq2C_Wp@jYRjQPklAe*0-q4fLASb<k*@+RJa^)J8{Z$;*rmWTW
HW>x<Wu>t%0

delta 11162
zcmYM(34D&n+Q;!*BoZV-LKYHvL=uGT2@*o6B?OIqsVzuK#gbUsq8?joIn-7fw5n(=
zEhSN*I21*7v9(IIx}=AyYKyl{%S+$i-^}Opo=@vLGtd3ZTyxDecj9!-vdVLoS9V_w
z@Lc8azwI856NZI#)cgPc9gKCHB)W&NA^widFtDk4J_`fr53&7;=%T*_6L2T`;8pC4
z*RdaFGD*7QxSdyMv}E9O^g{1A$7zdx=#Aa6GWNw_9Egpu2&>^5tbv=+7t63V9zi|#
zr5%5Wdahc$c`g*aSl@}Ep^2JVTVM_P?a?25q5{Z61(=TtWGrgub5YN&M$Pj!DwDf0
z5<f>jyp4MPAFPJ~q{o-_op>5`u@&lpewd77uqwW0$KOV!azEC<qo|#p!yLSZLoqqg
zak}AhB-_qaY=G4`M+MXjgYZdolXa(nhK_wDhT=A?g2%8rp2nJZ5p^WjQ5pChwPSCh
z^~3-S#9-TRiaL@+bYUiH{-LPvJ(o=Wbw+a;P^9l5!8%`|0`p06oD59E<~R{`1Y1xO
z>_Cpy*@sQ=8fqgoQyr&2#-IY7iOTS5+uw}}<l|KGA5NpfK2Rymd?5_=g;Z3kpG2M6
zP>jZDs0?jDJ+}pw;-lCYf5IsABkEe1jQYF-YT*J@V6)sb@@SOUf%~Y516r8t7K++w
zCTgK<48W0?j#E(+??N5Xd8~~UsOSDd1yG$U)(*o_nH`48q<b+9Rp$yM3C;%8L|-Du
z>s&*fVF;^f;%L<K8K~OG#wV~3>L^Q4MRo*r3o1~7=p0)^AZor`B(rX32n|J8h?;OF
z`r{(hdtfbU!LO0yb$-S`3~ObIE)gT>r(s>}i}i6LDv+h9jFzJ2-*5d0{dND((NF+C
zpw8|tcEK>h)r1A8FV03)`4Zb-f!fJ>)U9|2bzRF)nL32JuIDirub@(Y7gemTOfts$
zPFEUwuo$(o=@^1bF$lM!j^r?g;aOB*w@?fEv@r_=po%pXbtLJw{{m{B#i&ee!uog&
z-HPN#8Y&{+wq}R%r~p#19(F?=!Dy_5Q>}|pXS)%ViT6>NJc^<C1!_aTp*G-=Wfl%Z
zZ6G;|{43(_45-Qnqb7J7wczupFV08RM2YQhMJ>1=m4OqeBRY$E{u}EpRFywM9f2oT
zKt&#g%1F<4ZpUHs&S(bY7S!2Y!(@Db+DUwSv(s!;fKQ<UABPHL28QE8)JC?THc*Os
z{s^iF&!cY1WsJj0ZVpOSoq!QI5@T?#bvtU}bJpLnK7GFqyp*sR>PTi_cU*xA?0eKg
zzoT{<+|eu;kNo2d=8tG}Z=|8roI>s7dsM`?Fc$wo6=!TGQyVF$9kxX6;0aX9i;$O|
zGY54P`_K!IqcU+C704x25&w<^=yrTNn-5Yknh$a?28&P=m!JaLhB}%9sG>ZJz42FU
zgjv~Up3$h!-KZj4XWfgf=$}Jvz^{vrg!2!fp@<{U6PsESQ4gkJRm?(7+!a-f1*ib0
zqP{;LRYNOL0iQ?yaem?t%@g0%jHjcHEC*|_zLQ5o*JL89*yf?md_C$&4x*0eW841$
zqv-#Jx_*H<<~OJq^rk-ytKrkAK#Ng<&#|sYt@i=C`PccJKl)?cZYJVl)EON_O>i0Y
zKDc4~9#oq80jOKj6uBtQP^4U(4XA*xVFP@GN$Bc97O@vL#FahBzfxGvfF?YJ`r;3$
zFZ_*J*pyQD!9rAOr=WH|AFJY8^ux_|ycAV@AEA!)6KsNKQJJ`pnkOii{3}(BbNLaA
zDX1bTLS<kFDzMY2g(^^0d<%7ko;^+K>tYT1y-^E~zyutPn!g0A;3lk&+fkX>>!zU{
zU&31W2l}E%FEgP(YQp-c>W@OzNII%UdZW&~2(`fT*c4}>cK$9Z@ZG5A4xk4fLj~wQ
zL8B&(d#D|IbEmYkD2&AnOvHS2;cDdN<&<Lv-bcNV()ySM`=B;75S5W4)Pl26MLQRD
z_FIv8+|H*o;u-MoYf|3^iN%?QDfk(7!AkwiUmS8Ukp4zg;CoTEaS~m4)_NP2;(-1p
zkW@^j{{*(fsn}5We;*C)@EeRnzX4`Ptx)|zsG?bbytJInsGZ-$78o<o?0hIHkddfj
zEJS~tW?f`IUyI7bCJfa5KSe`l{tfD^ZlF?kR}Y}aAX}}d9XGc9bky@XsOS2kifs&P
z;mN3Z=b>t2Io8G!>kf45ful6!84SU1P{s169e;=_rfN@_1^iJ}To?6x3~Ir)s0E(H
zx;V=A-KaBv1(l(FcKpMq$iE)E$UqF<#zq)2*rX^6wNO6lb`+s@GS~JOVK)8OurvM#
z6-e9=b4xN&8|#nC&?wZ#o<jvXYY6$*1FINN$~R&t?nZs#6V!s=+5R=u+1|I~K0{4_
z{-}BCp?269^;{C_NZQ(dSJaUWz{)tnO(UH~0cPL^RD@Sh6IGy6|0^o6+o<<J^<id#
zTBsdISQAhiX^UE@2WkTY?D#NLpyN>ix~JO*7NYL^GSoFWfI6DrFcPZ{Hxo8P1=1X~
zP%eh!Fw{aXpcbBoTIgjA!gZ)4EJdaMIHu_SU#6im_RBM89*Wv|8w|tFc6=1-NETu+
zzHWUVRa~E;7PyVdVC4}ebJbDfHBs|MqB7PLgLMB}(Wt{fFVv1kqrUJgx^N*X;_ava
z4x^sGfC}UW*2798O+OrUE7DN&^gv}`IBK3}?f7D>!}`v88p^;PRD?%Rsr(q5;92W^
zOrRe%%Gd`R)1QZtxC3>BXHnmKfG&*AH_vrK%{u`}y)zZv8rV)lJKv37cm!3oCs3(8
zXZx2?&;Nu<;Z1CS4=@_T3+(TN=%QbQ%D@V&jGIwKw-r5cZvpvN;{XF*cm$P+6WA5c
zquzMoPn%z@;!)3y!vLIwdUd~q+EF<w)i+VM%44)C=GLgpOu+iM7L#!QX!5VfZ!(~X
zYmG5G4@N~CiP}MowIyojU9E#q0X}2<(@_Ea3%&6mDznG!=NGUF{R-6W`o&E{*T?G_
zQ$!6>*QPD1h`OP^kdH1bL`}E^Bk(obKZv@vpI~Erg!*2ivE~-Vqf(!Pjc_3LLHBGL
zTJRz&;tG76Lev*L3QY!TqN+U-t6~PK>N{A6qmFV0>bcq0HP+pzz&}PGyo6-j?fgJP
z8MuxLz-yd&zz;QH5b6l(VKt0HoqbDGAUW6s`=SDOqvlzSI@0y1RBuKd>0wlcj$w@M
z|F1MOVc>YP;~3OEO+^(^7dt)|wcv78VC%33Za_bL50&ymsG2yAdhSc>*Qfx#Lj_QQ
zKDz(D6HEr`SX1!rO8o5<+w%Ee6U`S|7MbG8Ll@&KP=S|W44yzud<&B>sMusI8>iCm
zjr`-B=8qPbIf-nwq%nntcD56r#C@op_)Ipb^hYfaj49X#{jnJJCY)m}K^^5zY=xhq
zir8n0IhqC-K))sGXmX~Ie@)Pn0iDs)sEOyG9$bM+;ajMp*^a9EGSpdLKt1;h>U$4S
zZ$dw|tAG<xKSTPX0-20axCCos=~VI`OXDO1fp`aVu*$P$!Ct5bpF(A5BG$rbsDKxv
zp5KD}?&93Vf%xQeX5MY67tR-`+j1B6J^$y;FQKt+8VwmJ#86y@O3ilEj&`ATcm!3|
z7f=&iK^5ISRAxM<nT+_Mz8{79UMxmqCf3D~s13}-ICL+wjelb@1HWQxjF@g5j2d5q
zs)<igfn7ko=_*h)QG15jKsIuroDo<T&tg5ii7xbh!PpoZ>Hc@2p$CerOHgOH4Yh+$
zu>pREs_sfNO(tSd_dXeQgoCje&PSd79t_1RsOSDf%^SgytA^TRk?#Kp{#8+YflB4y
zs0lr0nIA@RSf746*1-XojpI?NEk`Z%ExPc(7=$6SP4OjQclzD19j--X@*8~o_x}nS
z-59uo+Hu=CCgr_QseTcap;f3C%Wm|=qu2}2ppGDNuK69ZA1dJG7>T=3M|A;J%%1bi
zJfY|gWFVG?s=Ezp!EEe;15jVsh`Csfn$YJ(vxBCniIY*87>PQfg_wY)sGa_Z3it-r
zz<a2Tc)dja6+qBS=8YAL1L+S&?O-qJ^Dj}=e*-nqZB+F?LLHg!eDkKOgJJYts10SJ
zim)>_!x7jBm!bkKpU+wA!S5M}z+W&5t1U2JOh6q;SJdZ2FdAP#eQy&gBRf#fokbl<
z1uF373(a50yJ9l^sn{B~VH#d@(`Y~=Y>`P-8+6g{h~Zd(O4U46MpmIF+JnJ(9d)1o
zLG8TOzs&dIQAODe8)5<Ks1~6zasV~2`y!2MG_Iq*a0gZ8zKcyi64h^ws_I^-niylp
zXQBdl1r^}is6akKFZ|Jt|BR#QdoMBbOvGH>|M@i9@xdk3#C2ab|E(thHBkX7fVrsR
zT!S@m8*1Tws7#&4>i9F(!2dygUU{jhojRzq565)ui2CnOj+;hf21>C7UcpohTxMz^
z+d2+)_A780?n9k@$a3@UZ-rX$RgA}NsLwB9cYJ`^*ky&e9V<{TBj+d$70ZuU3-4hw
z^jT?+CJnvmXQ6hMjXBsKb!3}R3mig!tp1AmMWY`2(T~6oj6)q!CsfAs(XG^Op`i>M
zLZ#>$*2EgCOh6G>n|>1Nc67qAI2N<;E3AVdtIex69<}oUsEkcV1^gze)^4FE{<WI?
z`_g#GfOc5zRdWjhP!EQp0*OKemWEnr2nOLK)Q%US0$OXwtCVop>4&2}pM?Rq4D}}6
zWc!Cp$iIr`JOfJ29~goDYfS1AP}e6D6-XW`1I4JLdKGo1+fb>#g9^-9Yp!uH>Uy_C
zZD0@v;vDRUtKBqa(zu0vuyCEJ`VUbNUquCU8+8P=UNij|%%I;16~JuF#nTv!^<For
zPeGmaK<tX^FcGg|2)cvUn+X$9k>;W%E=Enf1FPUY48@12Oa#ASj;t|i$B9@UJEQJ>
z0s3GeCgT*;!dp=bU&iXX|95CS#lR!%kApUtpWmezLH{x;)qkUksrsAd^CVP&15gvb
ziF)n>%*0Po0ax2-ZcUUm1rr!=kI}mS#Wa+%64V5{P^mtO+QC;Cj^Cpue1r`!WRuB2
z1}a1Cu@iQ|s<;d_-&)i>@1h63k6mydKED4Ro6S$ZNK_zwup<^?XDmg%Q0}9yQIogK
zSx><j`X^Ag=N8t*KT*Y4^KG+WeQZj<0j6Mg?18h<t%0*Nve0vj`SIHkQ|Z5fJ@E@%
zfH7N5s^3G^z$xSmoy(|s{)3Siy3O30)~F2)$5!|pYT-SoTBy98{5PkOy4}3<$D$_K
zh@J5xj6uJ5Ov+O63HmdwN3jb1D(@QoP;bcEsN2&J6+m<J!5*kg_D3DfOYd_2I_nY!
zs^SjR3#J_F;b+zxs4Dl`VeW4jYT-oNZ-H7M2lf3vs6d{vK98Djfps&gXpgvU<1#j6
z;124GK|4+4(Wr$oQR5x3I`&3gw_&Ia%(VTLs2V7><Da22_9H65nD<N(C!hjyccGC^
zBOe>%8`e`;js9&^D*qQ1i2p8=fgl`6KNfrAJX9c;FdA=RAO`L>*SHZX!<|tJ_r#jI
z|Km)<nTg84Qq*-TLvK8XO8sT)ALvEjyVRu65A}HrDu7J%!(ONj3`Z7n#-cJe11sYK
z?56v_m_}a)E~6GqC^M;Qf$C>r5@y@}H1wxG2W#O9+uw`<^!K2O?j$N>-=PA$W_^e{
z``UX5i1nQ~8m%!M+u>A<#eJB96{sBrzi)mvM5A`p9(C5eQ45Vn?QjYP;%w9lYZWTc
z_fV<-5VfIi@$v8f{(H?r4N*JpkEu8elkpYQgeOr8UP0~P9_l&&a`Sly^rb%lHBUZj
z!EttcAqLZ5jZwI>ocwFT3k+z&-!KTh_nCKeeN>hAK<#84sy61MUcql+6Fh0hZ=;^~
z-*4uLM=jJ5!|)jl!TGkoVL$m-Y7Q}=6rQnO#Fq5G#dHk%!2BPOx!9KeQq<1Rpce2v
zV18w5f@$>oVFE5jeg7b8{(IO8AEGjp?mlSlbvx8RE~>Z&psvek)Y%uKCYXgfiutJP
zx(?&<ICjFjn1~sNOvc8ds{KV&W*4I7-GI79?(H-*@h%L<a-4`?Vh!x{Z-T+T=!rYA
zHkP4k;}mwl2N;T3hfOgL!WQ&jwf!>~L*Ms^`C*iTnY#bOXlUoJqmJS&RAl9-g$`NI
zqjr8BwUY;^3<P{=0&Rs)(C>=61uvtn<66}BcG&R`F`WKq=+gbaNkbF)9yI}^p^B<A
z>IG7Sx{fn27`I?EJdE1$uc!=EIcCm02X$oAF%lQr{<|1Q{{ws)f5yl6KlixFz+lv?
za}+A|i%=O@gR0t{sDMtQc5oge@DEf5Ykp*^JOnkKh6=DR*1-v=48Mpz_$s=iX>70q
zC#+}Ci}6cX7q6lg{u`B2&l4t~U{nnxqMjRxDz2HR?=L_F@-kM&o!AshF$1rjApc5f
z=t=WNOF~839<y+O9bbc*cso|XJ*W&FK)rBIqc?tqn(sT?|1Wyd{|6O-=P7fPKB(`d
zoMJnQFpGf(I2>1AjSVmRIQH-6^<B@7DJ*o2$ajs(FU+5uKgv}wq1ctj(3DB}#gobo
z=3VsjONvWMj!RB<C8cL1HZOZ)f~!)cmSsmK*6WnoEzgxdX>#89$@#^{cI3Gx<-76=
r$BY{@KCk%Lo34p@#d)sD6Gly#<SOLfDU+t;6_1%PsqE{$ZEO7>{=E+c

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 3047167f..096e7f63 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -29,7 +29,7 @@ msgid "installed"
 msgstr "instalado"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -49,9 +49,9 @@ msgstr "Reconexión correcta"
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Desconocido"
@@ -164,7 +164,7 @@ msgstr "¿Realmente deseas borrar este dominio?"
 msgid "Do you really want to delete this user?"
 msgstr "¿Realmente quieres borrar este usuario?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Realmente quieres eliminar este estante?"
 
@@ -286,7 +286,7 @@ msgstr "Ubicaciones del certificado de la CA del LDAP, del certificado o de la c
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
@@ -316,7 +316,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Database Configuration"
 msgstr "Configuración de la base de datos"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, rellena todos los campos!"
 
@@ -361,7 +361,7 @@ msgstr "Editar Usuario %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
@@ -396,7 +396,7 @@ msgstr "Actualizados los ajustes del servidor de correo electrónico"
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
@@ -496,108 +496,112 @@ msgstr "no configurado"
 msgid "Execution permissions missing"
 msgstr "Faltan permisos de ejecución"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Columna personalizada No.%(column)d no existe en la base de datos calibre"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Formato de libro eliminado con éxito"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Libro eliminado con éxito"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "oh, oh, el libro seleccionado no está disponible. El archivo no existe o no es accesible"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex) no es un número válido, saltando"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión '%(ext)s' a este servidor"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Archivo con formato %(ext)s añadido a %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Los identificadores no distinguen entre mayúsculas y minúsculas, sobrescribiendo el identificador antiguo"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados con éxito"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Error al editar el libro, por favor, compruebe el archivo de registro (logfile) para tener más detalles"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "El libro cargado probablemente existe en la biblioteca, considera cambiarlo antes de subirlo de nuevo: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "El archivo %(filename)s no pudo salvarse en el directorio temporal (Temp Dir)"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Fallo al mover el archivo de cubierta %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s ha sido subido"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro puesto a la cola para su conversión a %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
@@ -610,175 +614,175 @@ msgstr "La configuración de Google Drive no se ha completado, intente desactiva
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "El dominio Callback no se ha verificado, siga los pasos para verificarlo en la consola de desarrollador de Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formato no encontrado para el id del libro: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s no encontrado en Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s no encontrado: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Enviar al Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Este correo electrónico ha sido enviado usando Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Correo de prueba de Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Comprobar correo electrónico"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Primeros pasos con Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Correo electrónico de registro para el usuario: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Convertir %(orig)s a %(format)s y enviar al Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Enviado %(format)s al Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Enviar al Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "El archivo solicitado no puede ser leído. ¿Quizás existen problemas con los permisos?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Fallo al intentar borrar la carpeta del libro %(id)s, la ruta tiene subcarpetas: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "El eliminado del libro %(id)s falló: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Borrando el libro %(id)s, la ruta del libro es no válida: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "El renombrado del título de: '%(src)s' a '%(dest)s' falló con el error: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Ha fallado el cambio de nombre del archivo '%(src)s' a '%(dest)s' con el error: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Fichero %(file)s no encontrado en Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Dirección de correo no válida"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Error al descargar la cubierta"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Error en el formato de la cubierta"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Error al crear una ruta para la cubierta"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "El archivo de cubierta no es una imágen válida"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg/png/webp/bmp"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Sólo se admiten como portada los archivos jpg/jpeg"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "No se encuentra el archivo binario UnRar"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Error ejecutando UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Esperando"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Fallido"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Comenzado"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Finalizado"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, accede a calibre-web desde una ubicación que no sea localhost para obtener una api_endpoint válida para tu dispositivo Kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configuración de Kobo"
 
@@ -787,7 +791,7 @@ msgstr "Configuración de Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
@@ -853,7 +857,7 @@ msgid "{} Stars"
 msgstr "{} Estrellas"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Inicio de sesión"
 
@@ -1072,41 +1076,46 @@ msgstr "Editar un estante"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Ya existe un estante público con el nombre '%(title)s'."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Ya existe un estante privado con el nombre '%(title)s'."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Libro eliminado con éxito"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Error al abrir un estante. El estante no existe o no es accesible"
 
@@ -1187,14 +1196,14 @@ msgstr "Categoría : %(name)s"
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Buscar"
 
@@ -1214,102 +1223,102 @@ msgstr "Lista de formatos"
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Estado de lectura = $(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Error en la búsqueda de columnas personalizadas, por favor reinicia Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ha sucedido un error en el envío del libro: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor actualiza tu perfil con la dirección de correo de su kindle..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registro"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Se ha enviado un correo electrónico de verificación a su cuenta de correo."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login como: '%(nickname)s', no se puede acceder al servidor LDAP o usuario desconocido"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Una nueva contraseña se ha enviado a su cuenta de correo electrónico"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
@@ -1386,7 +1395,7 @@ msgid "Upload"
 msgstr "Subir archivo"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Descargar"
@@ -1553,39 +1562,38 @@ msgstr "Detalles"
 msgid "Current version"
 msgstr "Versión actual"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Comprobar actualizaciones"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Realizar actualización"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "¿Realmente quieres reiniciar?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "¿Realmente quiere detener?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Actualizando. Por favor, no recargue la página"
 
@@ -1598,39 +1606,39 @@ msgid "In Library"
 msgstr "En la Librería"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Ordenar en base a fecha del libro, más reciente primero"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Ordenar en base a fecha del libro, menos reciente primero"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Ordenar en base al título en orden alfabético invertido"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Ordenar en base a fecha de publicación, más reciente primero"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Ordenar en base a fecha de publicación, menos reciente primero"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "reducir"
 
@@ -2475,12 +2483,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar autores en orden alfabético"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar autores en orden alfabético inverso"
 
@@ -2969,30 +2977,26 @@ msgstr "De:"
 msgid "To:"
 msgstr "Para:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Borrar este estante"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Editar propiedades del estante"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Ordenar libros manualmente"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Deshabilitar cambio de orden"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Habilitar cambio de orden"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "La estantería se eliminará para todos los usuarios"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Compartir con todos"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index 6493ba4325f76fbee08206f00e39284f80e0ea76..fe916f5a3cbb89785496278a3971f56b23cddfb0 100644
GIT binary patch
delta 6733
zcmYM&32>Ih8Nl&393k9<a2p^20)!AqqJ|qH_o>{-(FPFYPyx|m1>v(JP-L`tQIG-(
zh)~6YMv$XbsR9DxG^kaJf)&d#fZ~C*sHOjZ-km9v$!~YRcXywCcK7|F&;C8>@CQkW
z6SXU>jQF=MDT>muLUn8Z|97Eb6y;OBh;6ZHqxiYOSeyEcP`?i|s6UCLa1V~gTGvET
zMVy9}@D41Gzrrd}l!)%7P>qJg!AH>!>*EKaXM!(b4chl$O+17S^fA`QPec1<WZ<YG
zt8qcK_~n{%(SW-kk3=_O0rN*Q!w2iI4j;UXIk+D)@oQ{`X^o?ZBt(Unj6<;&jzL#8
z9Svj-R={PLh7X7O26Um%q5+m*E9Q@0qu_+6F%N4uiBsJRJ5!&7h4?(0na?p7&tf*#
zYZ^s$u?P)dG#cnEWEY}kp?wpY!M*4L4r9UxN-4O~3uwn08Sy}^aT4_+Y>pez$PZvy
zKQyHm(EeA^jAT+t#R9wmd!uJ(DY}3XbW3(;lK<-{9HhaHKcR=MI{7wLJ<u%~jCPoW
zRdF`9!Uf1rw25Cne*j(KduRZkqi5wibW19*3f34^Mv@n0H&4U^^ryj;+=fmtH@FBL
zU^zPAn$W%top2Yr_xrIj9>o;=5Z#K;Lj4CcV@WOI=hD&7TP7$Nad)hTL(mAPpb;)c
zk`isg3b-FVy@%0^oJP0cJ2aq5S#h9s(5-BVj#GpNP>jwuAKl8tgA`2t6Ic;9qg(Pk
zcE``ql{ak}cg#m8Dni?bU@{itwRkJ?6RipEL(X+{Hki!58Bh!4&?cf@6o$|+7L9BR
z@)Pakml-*Meeg08OVp)xoVrP9AorqyEX6js8dLC1tbp&JD=kI0_7gO7XEELT|2+jK
zOye#&P#5&j4M9^q8AsqE^tof`fLAaXD>ADSRYTiTu`;Hk{ac3io>-PKbnlC?HuFdK
zP^g5<(GHIVUqs$L(P8BLL}$>gs>;iv0j8q^U5_a^1f5_sdM2i$fh<5*yd<<gjuojt
ziwPs&MuEjd+tC4zV->uJ-S7wOf`x74faanBtUxE&if+}P&==7mbSqDy6Mcz}_Z^zC
zt7zcKx#YhZg(kUihaB|Oc191)NHjBZ(T?-cfPaHdyfl3N2$rM18r$O^kYq(iFay8G
zo>;$K{6-yz9>SIF$iD-=LW2?SMhAKuTi_8i^_S2A>M;6n9D|<r=g`!jzzjTtH83U5
zFBc|6exiZ=a%&f0UtEQq@kD|`2MP`I<3NU?1CGY(Sd2CCj^M)Z`NQa!%kR+%p9}Tf
zm`eR9*20saehJN3Iij*(HFQf785G=t95lrp(bL}}I5K=bBRCJ;`v=giSsU7)K{L4>
z9e5`i_&zNAu0S(+0bO7%(#JfBs38R(XooFv0D8^lpj)sStKwg<KOVw<Sev($6O2R8
z%uGzf#b{uw(S<#YX6OZUfqzCb`(|04{V%291RtRtzCa`V8h!8zx}ucp<9ZsJ%1rEp
zIp|(aMJIk5?Y|WbY&&`jj-ca}qJf`O@Bdd6jPNQNVGX|QeXuS%Ky&o-Zs@HTj6OFL
z>*1Z~o-e~XxCUL&OK1l7q5*w|X6PJx{eH%Tg}R(T2gpSq?14_$KeUg*4C*t`36^7B
zd<yI14)k;%4fS*A8A<9GkJ||AQE!X(?-kl_?#TW-&`cVP_<l5ihtL(SM7BFx8|r^U
z1N#t7>1lLpE}*IZcc@=Q`&VIqOm!+|VJ3P=`vnJgBL5CFj0OW3gI=3k&~LxH(a%e;
zHtt4lZ1fHq*w4s;j`BGGZEy;5)1npVg!|C`XV45^3|_^uz!JPyEo7n-=c5z!L|1ed
zy5a@sik72?^igbp>qGmi=yR_HkD`Hnf~~P;*SLR2^gE>odd3nHD72z56CL<5bmFJN
z16$C@cc6QH5Iy}T@ftjbrnDko6n<VM*euu?-O}M`CdQ-VPm0?U(F_VsFc;m+#b~Nm
zpc8FGJ8VM-cm*5b9xRU^pey_sTVgr(&HmZw3cI3*ZeXYvqvPIDR%ie3p<rs4pj+?|
zI^a5dI*C6jk!_Bq6~$jJ8!(-EDLT=Y*cg*;h_72y980}7j>q-r0<NH$D#sUz^-5U7
z`(KlSd)Wj%3mwo1`=J31Lsv36w9i5JdOjNXgXjt$LC4vQj`JEe!*|hfzDDnVxn6Og
z^)SIzjk-{<!(HeD51^-c75e#KF&D3(d)&Hryj4Z$#Dmb=GZCBO?dVoLga-OpsBb_Q
zvL&?d=*|6aLBm@#w8C>}J+)7Ky$XXfaUkvM(G{OVpSy%vShsI{Cc2;jjz(WNvqF6d
zx>f7YfL_Lm_<CRR?+W(Qkct05PxVjeo;K*mpHWzd+4vNCNDpBXd>_r&x7ZRZ^^f0-
z?a)AaBR|mueznKV=)@nOTYNl0ftOYEFEoWs2E-|EgI>qU=wX|UWrq{ps&$x$FQ5~j
zKyOh+(o`Aiqp8kBpKp&&+ymXBKIqv<Or>Bdmtiu#fKL1hHpG2sDvzTp{RVw5c~E?c
ztD`Bci?+82?Kx=R*P;^-MKe1Z%i~;Z!~D@a3Qo8Iv+zYURqtaqRu~*#$97nW`WSS}
ziqRF{jc&zKbfufoiFTlYm!cUui*9MnA#uRDSf2T#t`s~RMQEfWked>X#Ufmb4*Y5G
zBASVxgQ+*h3&_HJ+6&OFnG#%yF6;oB=?lopqtu%?U(6qMr7#&sVKv-^?QuUE@nxh>
zlr}W}{{)lKt@#~R$E|2ac47e@LC?T{gDJz}71u`JoSA69u9z@&11aR;40L5{(9`=O
zx`zjFHl9MC8!<e*s?jZ3ffaBSR>ieg78tq}J45?1tVR6<8pv0}$-jjvBjSj&(9_u-
z-Lsp}3Fe`vbrJga!UnY8tJn&Up<8zaeFH`#<1K559?EP?!#p&g-l2WsNb;XT!!#NS
zaZY$}3%ZiMScC_WuYo9KR6IaGG()$b{THBHwK%kIL=WE{OvO^HgQw8U{1Doc6Qkn?
z8lVHVL08ZdUGaEyf<<V@--i0iP+yO(a2uAx63oG!*b_fT1Iro{FR&LDQJ;@Km)J|e
zm7c+x_$@k6`J3YalCh9_HV(px*ax>^d;A6suo+)@Ue_G-@Qp%0FAlCiPyg$9J$`{*
zz5k8I#s6_R23^VH=m2Z520nwPt^{l2+i1YYu|A$b1HX#yan14ZbIsAz7ovx*KUTr9
z=y+4Gs`vk13U*wAPW&V~@TTBibmI5Wj;GOE^CLQ7qY3c@S?B@^(XHx+E?^L*<2cO4
zd(Z`J#=74B?G#MSK`g)v=rwEli#UZt(f7jr$WQbzzgTQ^9u27PFXP)V9@DAMLvPXJ
z=*mmb{%@hTq!eB7hnR51=P5YQWpt%gisNh7810yaMqGfdtb3>rM*gUYZpI>9gI?F;
z=$SZ$zUeN6_WBd!@tXz<CX)YpJkW;*_i6(A<uD6P?Ob$43(?QlVA*L8mY@OeL05Vd
zeeOi?5_Y9tZc@CpJ<zZD0oVX<o0N!OD2r(*n*iOjZCDrg;x$-`t??o@!+MkBS8ykE
zpb==Gx1*VSFnqoq?Y|3s?tN^67t!adC2om3WTPwTj_%Dcbfr_#6yA>R-70h|)`idi
zh@SqJ(XD&~P5oi?mHZwW&_|e!7tzetpAtWxXhy+?wrBty&<+E!Cl;d<Z$vY*6?5=a
z?1ZP#S8(I0@!{=*uJG5GfveCnu?x-c8)#;aAsI<TXDKwIA?emQCF$skqZ1m~40MHe
z2N$CmdIC-DR&?cWh0otbukQ(T0pDX5cA6GvrWiA+PscRx|8fciG^|HcTZ*3YPtgg^
zqldK8^f=HaXnUvND74?5n1Kti8Lr2sxDO5RpXebykIDEGR%QOE{ERrFn&?XN(G=Z)
zPCN!H;ViV{JZyyvLwz&0rM?Y2<Hu;fIy2*x=b+<t3-u9Lnfg?0?ERh{8ty~Sz*5Y^
yCrkd*a6sddTRT)vsa}wqm!F$gn2~>7=e%o6?(5MgDXCM*s-mu$B|lEesr)~W^6G~G

delta 6815
zcmYM$32>Ih8Nl&3nuKr$!VL+02}eK)5RS+#h=7P9f+#3a0t5^&1_{cgeAJ3m@#=7h
zI(Qc;R#8J0#REi9pfVf{8qto}TEqh!tq6#=|9{?{sl(*AyYIWZ&px~Re(tVHS$`-c
z`H!sB)e-+amJ&tTSg*dd|NnQkWfT=s{S~`lw^s3clQ4_=!ce~#6V(5V<8e1$jfvJ#
zl!o)M7T%8M;xeogMak%H3iW7M6?_uy@Iw4Tv^n@THlTesW@0ru&@pU|--Y%xR>8ng
zQ*=QI{<x-rXuzY8SEK8(2lGdZ!h`3r2@kg6`B;Uyn35AkdDsp~LNpxHaWXc<8R*Iu
zpn)vKR9uUVab2jtgf8?IG{7C0&-~F|3Ql+uyJKFPIMw5@AN8eJgj><f{D1{`3Oi%R
zwyYM%paD!r16_jbLbNutSE3o*gD&6`O!~qR3a<1l+ObU{9;gqNP#=Ts@MSdeLs-)f
zP3c**e<pv-NFg@Di*N{Dg`S-?=mK`2Te2&c{P&{p5e;^%N1i=wIcTb`K(}NP+Tmub
zi%HDK70AD+l0UwG2wmYn(Exrx&q^xMyCqGKHAXFw<VAhkCF21m&|pdyqZ8Z_ydNFl
z5p=+fq5TbX!Vl2Bufp2+8D`*7bSu6O^^Ep$#u}mTbwQsOB`Fy3Xl#bXXoU072v;G=
zi7GJ_tI*T?37V0U=oX}Qhy!Yl2HGCo$|7`}G3b_+qx0Q^Ze{Xe3a0)UOvAsTTe1}g
z;rHl(-8#k{hoCDTgSHoAI+kNkycPKuZ4B;5&UJJu*o=KMpkBzKO-AD=Tuwt78riGJ
zzi20a%*b&ZhH0Imh*+XgXzFf81GyUwWDTB&8!!V8q8a-XUFi{YYrjP^cM7w;|LNQz
zCv1lfGzvX*#b~PM;yAn?eeVl&z&gy9j!n^tveEWjtc_jJ{zajEEY@TUT|hZzF@Ln2
zLM?m*?eJ9aE#w;%eS(~$=x21RTJy1JfnCsnhG7O4qZ3R=&%^>WkQL~PSBLheF^&2w
zm^AV?D6pt#J37EOSO<T_ftb-Hiu&VlG@v`s03Jst*n)1=JLrd~8r{kh=tRGv<E0kF
z8OuZiZ&pD5>rv=RgB|*#r}k3x&`d)!a|fF0d(eRYh)%pFJbwbup}qmT;d4l`qQjWL
z^sao2FdzHjO!N@`sVn(+z;|hAfV<FvKF0QV7)`ySIzW3Ii!;#E{yLia<Cwso(Q#UI
z_s4|^k$=&({Bdhn;Bb5v4di%|!UYsM7si2<paV|F`dE&cczf`^@O&LMrhPp+;p?Hk
z3mZ}Y3>)H!P&XPgmWB4qMz<u{oq}7?A5HNk=;^;AI4wM17`zMJ`<3X{{3Wz+Ml-n`
z9e5`i_<pSUtw1w*7F}S1^f6B|>P*2G24P2>h+ea$=oW0iy7(bpg4H+z^Y}_R!A$hb
zEW*aP3Jq)ny090~484gi@NZ~l57yM#|05Kf;48Glf6xe1ddDx;L08lw)Z3w{EX2Op
zAKlAa(1~9}`)@%5+m7CX!|23E(7;cq_y4~Xj4+cQc_VCtzSsdBpeOqLa`aYALf>12
z&G2{Vp0C9wxDj2@+h_*&paFf4X6Q6}{pxe@k`_8paBl{p1C^j1D$t2<3+*c~L46%M
z(OcLQ4`OpXhMw}2K5;z<JuAJ@aYth_oQ(FL--rG8!M!v%&|_%io6!Kap)1{mY<sjX
z)Kkg3fz?G*+X~&H1iA(1hk8%6{~$Ew!>|L6M-S`bzTy5arNM!gp#iKwug^p1ui%F8
z{3vEo{|>piH5+eWg&Y75c2tVz;aV)j9q5EVq2ssaGwOnKgFTZJY9b4cM<*^tC%6?|
z(X;4^H=!$f3q7pwVGBGE+P^{H`yrSzAP%e{cA|YK+J81?W3qyRhwVYk$H&ltccK#?
z49^dvksm|%`WN&TH0B4QHRhlx?TbDi6udfk6S}2$p_zC989y1V4iDC$6Rbz~atoU3
z9q2@d(11Qi2lxtG;c+|{YqL+Tus(LgBD8-oy1+T;p<5E_E3r27M^A=^=g`!=hHk+&
zbin=iL`oE$LAE`5ba4D5Q-#^o(}u(o<zWu>-srU(hZAuDUWW(J1$5<y#7q@oE$@GS
z3hvoZbT7xEXJQt*^2KOC%g~jq3GL6I{a!!=e-mBdyXZL8=r})M9-cEa9;XBP9VkNo
z|1-Lj0#`RGM>{+lUU(Hf&3nT0lUP8#>&5XNPeQk99y)Ony*;b2Ek1#6)iyNHouOWZ
zF68jV<lhI!XlRe8FduV<#r0w6^_m%c3@@dA09|p;@c6y<*n#>;^h}hahwvWsgY#6V
zzlNTP{ph^^8czPxDEvr+D>#k0*kD9_s=K3mdKun`GqE!sL|6VRw!w@`;*{oNN9z62
z584zokOj!U=t2H;!)kQi+R2ge9%mvSx2PqW!m;R<T#sJIHRxe`8fy+Gx>ftp@5B*w
z;w;kRE$WN4aTJ>B@#y<g(TOY2ElMt=;Nf@}-GVnT9gm<Be}ygaCp49rqvDlzMBnR&
zwQvZU(vhKkLTJAM4SWVV@tx@R;vPKL`@f#Tc{FT9C#=E__ywA(jLYJb_rXror=SzA
zK(}lqy5bG!R=kd`v>Ki07#eum<#C3x(JdW{4ZQy)6o@36gC34~Xr#-Ln-krKgK-}^
zaHG+&x#%@23=YG3)F)ygPDi(9ZEzR5urp|;6IZZs=8uL^@V?H$DR?(J(6`tPPooic
z9>Y&4j==MA4Z1b&V14`)&B)i-1OJPjfgV@J4!{P~hoiS-JSOcphk~hFg57Z)y0X3K
z>HPxT!!uZp&Bw;?Eyp_4x1d|H15<Gi*2R5T6BxP`Ux)Veaq%I}8b|((q#X@92#t6m
zdOD|~r~3Ek1RK%A`Z9XGs?dJlU_Pc_6>nWvG^4#R6E8;(YcV#)X=p$Tt|I?FSVcny
zK8i*7OnC7yx{?z(7=J;22BHDu;{g_<8F~oqzX{!{EusAodiaiGBTTzG-lFDcX1XLP
z_@H0#GIYS}(G}c^uJ{3Tf|t>bTSI+Us2@NV@;RP^N6|C#HC}|xu89Mih(*-r<6um_
zK*1MJpet=XAx>F7I?x4}hyBow#W)IA;V}FhJ)|A^sWZT<u`}L)ZspzR^OeCJ=;{9v
zdwc&|TuVA>7>)gL1-g>=(E;|Nr}krPf=4k6&!PcmUKeMqHM-Y5(LElDzIP3p;hESF
zZ$l65eb~hNzm|dnJ&$&L4W0NyY>poVPoM+VniL1p3cWSm&;duI6HG)GFcaOXo6!X%
zF&pp40(=hZdjG2_G{rB`)ck@yFi{*|vvFt&??k@~n~{IfcK(orsO|M}K#Q;y^#?E;
zH=?)beKfG6X#Z2_2QKXff^x-mDY)XcXo@?dD;<PhyDPEg%Z6rZI=ZsCp}rLPpPT4j
z9E^L>ewmZwGtnIV#3#`9QRw*NCX;^)(`jgi3(>uL5d9=Sg{F2rx}ulR=X<f{v<Hu(
z;~Ym<no<(KmlbS}186To7g~Y2cza1QzGjcp;1+B_KO}q6iB6(>moX)N-W*#~FThSX
z67z5_w#3!g0ym)ne}HE6%kcaR+P}%v_`U8)3T<c@iFUXV?XV18(Ie;<J&&$<JDSQ5
z&^`PS-ICMcdD^u27SuymnvGt|j+lzw(D8d=XH1TyV2Ufy4ogD)4`=`@(GKhJBHW5j
z{2Q8?)YAC-(HQ$uzYxvfLhON0q6_>xCh$k}3^bWuli_5PO~KT6MN@Y%dWwtDj4VJ;
z|7tYQ_t1O3FZel{q3_Yurp|~Ll0e@(5530y&;^Xe4!9aKy#HG%<kIjiI?%t-$j_ju
zEx0j0?S0V+MxcjvDjMjb(7rnO658)WOkg$U;Tdd;Ic0Hx1F<3VM<Xbt;{>$h4QN2K
z&=uT=W@sHcaV6Hm-Dtl9n2*(=o-&gk7U~(;4|}8i=AegqIXd3MSYX2@3bk=Nde8TS
z`p4)Q_yW7*PnE}7j?8J3m|r$~c4A6tVp{3!(s`xR64T4)CQ4|!rJ{6hMP-)@GBfHI
z78Ld<=+Prl*tcKzqRLAyY?YGIr*i7x0l9gJIpt*)^GfHHl-!h<RZ=#qZ1%j8#LSXJ
U*{oa2DoQKnmE~4GTvAy3f8@Ley#N3J

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index ae6cbd12..938ae04f 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "ei asennettu"
 msgid "installed"
 msgstr "asennettu"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Tilastot"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Tuntematon"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Database Configuration"
 msgstr "Ominaisuuksien asetukset"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
@@ -357,7 +357,7 @@ msgstr "Muokkaa käyttäjää %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
@@ -392,7 +392,7 @@ msgstr "Sähköpostipalvelimen tiedot päivitetty"
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
@@ -490,108 +490,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Virhe eKirjan avaamisessa. Tiedostoa ei ole tai se ei ole saatavilla:"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "muokkaa metadataa"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s ei ole kelvollinen kieli"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Tiedostopääte '%(ext)s' ei ole sallittujen palvelimelle ladattavien listalla"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Kirjan editoinnissa tapahtui virhe, tarkista virheilmoitus lokista"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
@@ -604,175 +608,175 @@ msgstr "Google Drive asetukset ei ole valmiit. Koita poistaa Google Drive käyt
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Paluuosoitteen domain ei ole varmistettu, seuraa ohjeita vamistaaksesi sen googlen kehittäjäkonsolissa"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s tiedostomuotoa ei löytynyt kirjalle: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s ei löytynyt Google Drivesta: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s ei löydy: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Lähetä Kindleen"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Tämä sähköposti on lähetetty Calibre-Web:sta."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web testisähköposti"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Testi sähköposti"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Aloita Calibre-Web:in käyttö"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rekiströintisähköposti käyttäjälle: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Muunna %(orig)s muotoon %(format)s ja lähetä Kindleen"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Lähetä %(format)s Kindleen"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Lähetä Kindleen"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Haettua tiedostoa ei pystytty lukemaan. Ehkä vaäärät oikeudet?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Tiedon muuttaminen arvosta: '%(src)s' arvoon '%(dest)s' epäonnistui virheeseen: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Tiedoston nimeäminen polusta '%(src)s' polkuun '%(dest)s' epäonnistui virheeseen: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Tiedostoa %(file)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Odottaa"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Aloitettu"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Valmistui"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -781,7 +785,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
@@ -847,7 +851,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
@@ -1066,41 +1070,46 @@ msgstr "Muokkaa hyllyä"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hylly %(title)s luotu"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hylly %(title)s muutettu"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Metadata päivitetty onnistuneesti"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylly: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
 
@@ -1181,14 +1190,14 @@ msgstr "Kategoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Hae"
 
@@ -1208,102 +1217,102 @@ msgstr "Tiedostomuotolistaus"
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Kirjan: %(res)s lähettämisessa tapahtui virhe"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
@@ -1380,7 +1389,7 @@ msgid "Upload"
 msgstr "Lähetä"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Lataa"
@@ -1547,39 +1556,38 @@ msgstr "Yksityiskohdat"
 msgid "Current version"
 msgstr "Nykyinen versio"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Tarkista päivitykset"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Päivitä"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Haluatko varmasti uudelleenkäynnistää Calibre-Webin?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Haluatko varmasti pysäyttää Calibre-Webin?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Päivitetään, älä päivitä sivua"
 
@@ -1592,39 +1600,39 @@ msgid "In Library"
 msgstr "Kirjastossa"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "vähennä"
 
@@ -2467,12 +2475,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2961,30 +2969,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Poista tämä hylly"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Hylly poistetaan kaikilta ja ikuisesti!"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "pitäisikö hyllyn olla julkinen?"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index ed7751543b7f4b78e543f112eedb1f6a3dcadf29..7b381167fc288133cbea7631952fd53ae4cbfb5e 100644
GIT binary patch
delta 11059
zcmYM(3w+OI|HtvKc3_*G&CG25Y|J)h2eV;pBQ|n~Wpj2Ll1N)lH;Jz>MC6!5L{8;=
z%ApjB9GgW4byt#fxRDC?t-4kJ*V}bH9{(P-=XHI5-|uyOuFv(kzQ57N^<HnT^KvhR
zc`tSN=k*61ryll?Q1Ac$S(WTK>2z0PJXT>7yp6iw)7Wvsunnr;9X&V-Q*l1lz{6OK
zC$R)$7^J1+xXxG_Ex51)eeeg&!=JD^rldHI7dFR8Y>ADq2m0eg48j>$6BlDGT#LGI
zpS}JS>b`5X|2z6HzvJ7~3{=w^iMlZkgE1WyKwDIR9Z-REMy-4Z>b~))fM%jHu@K{M
z2L|GK)cs#$G~U9R%<lw|r@9!8x*-cQuoL>>v-bK-R4P|s5UxY5bT@X!6F3mV(j2D?
zK8<ACIgIu38Y-Zg>}PFEMVBl)1vIqnV=xMzM_*iz0k{Q2a6f8GPNFhUg<A0s=#959
z9PiqG0ISfJgrEmwP~+#Kp6i`K{<TL#xS&YqB0)L_P=Wo3tuUe)S;6k8EtrKGU>>rK
z&T>q`6R3s!g1yi;(*!yYmErNWzYrD3=1lS*L*tme;TwCyJ=?F<+@v}cwP(555c{Gs
zG!-@QEL4iuVIm&K2KW<(Vi?iu^9HDi3s4yx<kBdmF~MH=7i!>JsN?oKYNavRW}-w4
zqyG@L#1hoN3s76M2W#Om)P0|!0=SNC@lRA{^Eh(Kr28ZdRp)4A(au!VK>LtwbWWi5
z@Hf=JKFq57>!NBS5g)=#)K*SF71>(UDL94-<TAF#+o<u<*jI|!b=uHSgk4Yr4#Z#_
zfqD--gPQOyWLuq67>@T)MHiCeI1ge3*2U%+i``Lyl%X=Z2sQo+>qZRL`QJ@L0lbUa
zyN|FF-a`#oK-hY)6gA-}+aHZu$rRM7n2S2Di&2?cjXJJ-FcJ@;QvVUESe-UxjQO2p
z8oIFvwX%L#2g|TF&PHv?8mx!AP=QsVCj1dK!7bE#!9Uk*NffF-05#5&s7y`ASX_^;
zB6*L7is%Mvg+X~HfN+ea-vqS<9Weq+tWTo$b{Z-ZOHr9zhf(+jYC-2v3%G)s_%><*
zVfo}=5vJsuDsPP%pb#}-AJl`7qiSM;?axL{xB``dO{gu}g}VQ3YbC16FQGDY6;<T-
zP#H;Y>vE=PbmVNvS*X1`ff@J(Y9&GK%t{kc0p_3r?}`efKgQq_sN*^dwSYya``4n1
za1ZK~yoo9JjY~sS9n2Ye5Ff$>9Ace=8hE$03S;U2gpXj&_GU}^V^{j4QGp#rO;m+i
z>0Q)>K^^!4!`A$0i0(8RO3mx2l^jJyT#3o}HL5uM3ruZ<qgGf4HDEj{<voy>oiiA<
z70b~FH((%cK?QOURm4?DfUa}Heo(8>MAR4)xS<DX;0dUJo=0uX%c!E<g^%I~*a$rx
z%>*4$pZ^0@WRt8fVGjM>s0I9lzRd6ZMne(*jouj0$rysVF#=U&9@N0esA4QY1z3W5
z{&7?djX?#x2l>}I&JT?f^su=eg*ruzF^Kt{wls81x}%D1C~D8AptfWcYKu18{=3+K
z{yEg~yN$e^9pBF8MU;pB^b1je7NG(kY@LFdZza0?=j`A|FZ=@)aZwkuN2^c+yoq`t
zowofewtowCN&=`n4vLeDl#4SJ74Qj6$4i)xA>GWES`Sp_#&skA8h9ob^uQX_0|zi4
z|BW>;nNn9uo1s?R0sXKy2I63Qy&P3^(@|UbJSO3MR0a;B#`zePq3<6d|GYJwU%8;-
zNbPP`J`xq!Y}7=rqN;Z*YVY1drTjAt!q6UOVh^U$Pe4sjg1%Ua0XQ7%<5<*!Uvg=L
z(%6AD@hED*O4LfeL{<G2RBhZv)kbKM+3Qr)1liaab5ScFfeO3~tK&p`0G~qzI0Hk_
zeS?P1<NK(UUBP7h4bw25Gv>jb$h*oJhpq4+>P2)LHDOp!v!Y1U0#Z>E=Aw$VEym+8
z)Hrjnsm^~T4W<4bGN;p`*t`+vVki1Xumt`15srgUk&i{yMg@9szI7)m#UG*qxrG^6
zjS6pznW#X<W17zYN*XC#IEz}*@3vp3w<($e<Q?S<My-4^X5&@V%Iozpfz(G8V=@L~
z3u{OFd2duEN>K}$iT8j1Ur9rI^%^ST-S&o~7)t+R)QZ2i{ky39{rZ}L!coQ62sLpA
zs+QWJYU2^Cg(cRJ_VcOe>c)9A>flOLvFx=s973(|6l#J>R26@Qy8kL_!aq?H1oktp
z+&EOf4Jy?|sI3}rue(^6{*r#=KY_+hF6bTpDJn&Op(cv&Z!(aIT1i{m?})suoxWIz
z>rsJR$0+<CYGDxrOorl63(G<UmW%rQ(E;qgQa*?adaw+&H_xLcTy6UsP<wmOUO#~f
zuo5-U=cpBakGk(?RL1_a{Tc(!meoctu6wX0HgIXQqA?H^;R@71ucA`F1r^v%)cfEx
zYJw`%iode{gj&d-sM@Ic53_*UsOvGPK%1bRZ)rbw3u)-QcS9YMiKxBVhH-cjHQ+T=
zAa_s$1`RSVq8L=Ba!~iRLrv5LYhxc&5tpM<KMkAVG9-hpbC!no{32@Q_pl!Nl$z^t
zs4XePNbF}FgBo})Ds!t*8QW;DZ$XXsHY!u^qXPN_^`g6hK|22r3^oIWqK6OSQIWPs
zP230dz$jDz(=i%fw*3RB(@=#9=ttB<f1t(*9b&F0pvGx|s-13FgZZ7lG?c<2n1my&
zOE8uGVe3syq#rxfY)v6*>qelSTZ$e$g1YZAYFxj^Ov*!0{r0FW?2N7tjlMKgt%Fdh
z9BKPwP!CK&rLY3)<5Fyh2QUS{LJtNEGb?R^Ui5QO#nukJvAeYxedzZcM*fwGL0otk
zpG3Xs4qz^xvNu+L+<fl`qP~<os3PitN_7S5IIThz@u#TF_zgF&^h`{r|0pW(3RD1F
zhm(J;d^Z;q@!P09JZimwTKQG$9aMncPnhcwsDK(`bu2-pcA))y6#CMij5<{_Fb3D4
zYUmx8#{Cxvs))WvJ@7Yr(07Cxun|5;Kg;$@P%C{56LC4}xpz^g=M*aS-(e%XjXg1X
zq?xZA6|g&*#{Cqc9$1CSz!p@szm0zQF)HFq);~~tTKh?JU$nKEwKFOcL$C&pMx}fb
zDg)0U0l3Z@d&6s}0e7JS*oXdj62tHUDv<9m34cZf9yQ9WBn>q|3skCeQCr#vm7xKc
zfHP6!ZO1^J|D!Z?PS2r==-c}r5am;5!p5k;nxj_K3InkdD&@UUH8Bu%Uzv3*Du9Wo
z04Ad{u?dxdol@t&lE%1de0yOV`laROceypFUo_65_TKAh6L~ypkF(H&k79Eii<)2y
zvIb`_mSO$T=C58BqQ*am%4E$k<i8h<+BCG1r%**P4pVS4YT&J?lzoFr`5n{>0>+w^
zC1D5pMX2k`QE$5asQW*_Ap90X@fK=py~mM%eGoj(Oc0AoVLB?pEL8R8V;l}gWnwPY
z!mXHrM==?1qf#9^-n^&^F`oVtsA8UndZTW{2>fI``Ol|uoeNrdlYg2(GEu24MD1;N
z)VE(Lmf|FQ2ERg1meYHJc@G>zW$q3tpty-9kgnL7ei>>(hftaN)}^7;S7S82XlkHR
zR0kDMGU~<*jKc1y`$wSO7f++^n}d385vJn?)I^`6GW-{|z`#l7%~^oW>ATO+c!<U>
z<hLg04)(zw&zgz0qB5`to8d8Rg?BL;GbZz$j@_^>p10mWZB_Lt<`vus6;J`z!>5q@
zU1u&04;MC}GH?==x{H{J53ohrifq*Nd~Av%ZGWZhzmK)Keh2k_2$*W_YmN`nABuZ$
z2C4?KpHt?z`EeR)Tqwf;T#GTd4OJv(um@g7tvrL}Y6YV(4(Fim-;SE-EOx}}*ab7E
zn@m23dT-3eHuw^TGr#jO4GsJw>X^mPFe%GI^@~wkFdS7x6EPRx$1L=&FsaSKSo%Y-
z7^k5Y@EPi~+{AG7nrUh!5?u|PL_-g>LfyCkd*ViHj(?yprp+=%l#NPpIckemVm?-(
zj%~<n6L?*Wq@QB#fGXkvsKEa@oBUHJ&JHdpbxoc(5qH7r^arE1WCSX8<FN+LKtG&^
z4RIOz<2$IWIEC8M@3ApP&N2OmP~(h6JvVI*`A?wny1h_^O4)xf4g=<z7f4go@hZYZ
z9E!@^JXGdhL8bN%#$$~a%pW$Jp!WJH)D~|;9nT+73ygB-nFs2lBJO}n(RfV41(=L)
zq4xGWRF!+rH!F=sWv(UG$3Cc(Pr}By7`2ci*a)v+0Q$dZj;~vrhW0!I^+GAM{XwWq
zjI;f@w!apYiT%j=bxxt4`xaFr_fQM*T44T8DHByAFQDEl?^>f5-d~98jHA(BH=qa4
zn-82@sFeCGGRB}*mX6wjPUw%LF%TzXD$Yfv_7JAyG1U0~L7kdbi_P_k*hS}mD-GT7
z8*1;`EHRd16Z#c60{5V{CT1y>i`l6DPRzm6s4eq($(){496)~t>eYJ%wT02k%;{)_
z^_bu3N+TObpsIVFbt{I^e*+8fB-X~D<z^)fQ2`7^rG5&AVg+iim!WFo2sXp7u?~i>
zFo8BfSJhuaBLpX76wXJz+h0c=ljArJub~DSw9*W;1k>nmM~!m{HL=gj{3?$rsA5}*
z+LBFJ6L+8jKJ+sA*9Y%$L3?=ywSrGj)%yb~1L3PoktU!9$icqY5tY*QSd8zXp0Bgo
zJeQ2hKpPCk0T_d$taDeBe?`2R3qg1u8{lQsL_V*WH&qxakWSbg`=hpMyS=_2Bj}$-
zW$bIzvGrMFuBYMS^b2q>?y&t(cdhv{nTXngm(YW+p(Z?q(f9?n#=BUEnXmFv!DmrL
zdmRffc%Av%vJzA=ZpT`95p`;AU>ruQH(&d13mV<H@GNRi&SHJMfJ)^Z)E4<}Fvl<m
zm7zHF!9vt?T`?bfqE@~X75Guq@%$2d;5BTItvBAk&vl-ok-&v*sOtO(>){Rbpx-8w
z@??yqKMDPCCFbD<RG?Q;TlQbn^Ior+40zB(|6x={N1`%41#9X2zeqy^Zoqilfl+t?
zo8k?uj?u3h<FSB#W7{8%TH!OcKO4R1FTfmJf|2+kHpCxMrzU7K1<d?T9*shrjk)+C
zs>p)3nD6^Rs6e)%4}O6vwr@~XeHS0V>RZjJ@yC|*vrwrnM~%M^d*Ywi3yZdK{&k+W
z(CCksupD!?n-|SCRLYK_Qu`^k!*5XmCG0S-++tM5Dli+@ppN53Ov03%CZJx}g8o8O
zrqApo|BukP$pxh*cb8fDQ0zv3A9g_R-R92)4`TrRM^Jm-4;A1jRP9Vfe_Vm-xB*rD
zpQ7%&j@rt<FdTjNkbf0R-94sAvQano#!wuIHE=R2<ulO_SD^;jgdzAADzLMtOkA}7
zigoD+>@_B!PFGvhRt|A#=$-xqY7eKPRxlkEz<gBIuSFHn5!6aAVk7*;_UpXCe$r1z
z1vCR=aH(}KD)r~FHTv%}eYcQC7#F6ZB3+DH;SSV<2k|NV5Q{Nyzggi@)aN@<3pk1C
zc*$N5IbbrHh+0S|jKF>vhfiaqe*a%WLlbU81+X8(@jNQ^-(fJ`wEl&@^n(tX7fb|3
z(oe_x6Jag-{ZPlS9Q)!}R83W(Y9RJajnDok(9qtcVjIl4{{g>dqf$5xRjq5$gU4<E
zJJdveZ<#=2QGql<Wi$^}TSXX%WtfkXQGp!BW;*|Yhs-aFZBctS9aSVtP?^||jqwaB
z^8ca+{0p_>ns1veiACMt0_$KGEX2pKE^bF{(J9n||G@kI|Ihaw^E+A*M)Sce)VW=6
z`<19Y{x@o?oWmv%e|(T`80!6yfqFg<wa5KX3z>p3xEAZ-VQh(C947xtZNw3CLre6~
z?}d6FOu(l2ioITm8u%t^pwOe{6f{KzSc1Af3N`T@R7SU<w(1>J?OedN`1w)S>`C;y
zCRP1W@AeJY8n2@QNPN%y9?%Q(=+DO#JcrHj9%|sUW9Ip6RDTMp7AjDgTaG&3>rlnL
z-KC+_?MFRu47I0cunB&Nndo=iycu&*6TXN#PRGy-KSyQYE7acJL5=6UZ?>vBDigt2
zjviF4xC?1?rm+$Az^|xO{f6x^@Px4l^}sSLz^&L0Z(%AnKWS>=F^s2Qf%&)@eefCv
z;V<Zoe<K0Aj`t~3&C#fpC!vl}4kqKHsK}>aM|=^h<7cP=FQcCO8I|H{r%i?eFrR)N
z*2k%+``6k2Zj9FX|A>Z;#m}ge)<0vupR-ZLG#tBN1?s*Fs4eq8YyNZ`im~(yu>%gn
zNw^Jl8WKM+3uuo?^ovn7;bJ87JBw(<;TBYcm6(8EVgvN5G<%we9{QQ66c?k8)kNE0
zhRVbtR4r7Zp1+F9nBO^5bfKu4sf(@#ilw2wZHMZYpjPw@w!#${g&(6o-b4-fJ8DJM
zs?30mF`s@as&>jz&+S8PVHGN{%cxUyw~GAh&6NG2*}EcCWc@J+2Vo$VVGW#&O5IHK
z#TBSxT8nyaBWB@d48Y5%4BWs*7<!%`4HJizjUH7xHffA!SlQwm$-#S1Ctu9kd%Sdi
mU|>c{T6#)amM1;4Ra&#Xv&#IcRcpC-VfhPP_ZA=S9{zuxv;&#|

delta 11149
zcmYM)3w+OI|HtvK%{Dt?Y%`nrnZphm+c4WSn=_e-*yNPS)-cRwDbf!~NRk{A<rqo~
zmC0=lWvW}m-=SityMyk#A~zN4e!aV{$K&rI&+GdBzTfNmT%YT6eShOo<wnmfn>^i@
zg6pnu__f``aUyYCh<gA3>#calNus+GTVgHVhn{WC{fQV%e}L_eK^Og5*dEtoJv@O!
z@f_x20)wPEj@y|>Bb5t>&<k&4Cf-9I%t&A|?1f?24`VPN{cs@$;c^VXP1qQBqwf3A
zUjGm3zCUc=x1Hv5J5DGK4HRjO!65p{SRcEg0vLn}a40H}5vY}yq3)ZH8fPUclN&G^
z4`Co)LEZl|MxY1j31EIFibhjxi@KpVCga2Ci;L~`m8ev1#~|E;T4^=*$Fn#ZqZ1t`
z8|NU|c1~am`~wwGB>NePndm0VPA&~?`!g7hYtS3_qCXzM2KW(bOU|J(P>WjeZLEtP
zMBNB|Q2hwhmblP`38?XNP|p=5lYi||85b1kS|mv47%H&eFdbWWaGVqzgW7^sr~%d?
z+v#k>I6RAg*KbG1$)g{N3Uo3m!}D!_11gZpj^w`?jnnpq>-L6#PUeADs8na7_ACcm
z;{;TOmZAn;g-Y=rjKwq93h!Y<j3#=0-Vrr%E-J7RH;sH63+#n!sDV8?o8#t-T4@4m
zqErmVhcFEbQ3Jn@+M>hQ7*C__`yLg*9qfjI95rQjAS#pYr)a1;=OT-DmZApw5ZPAe
zENTzyF`EVsLERsZs*P0afjv=Mxd2sUyHTg$G%Ao^@P71UKQ&$!l3BMifQBL*i5hS+
z*2fvB_rN05gdZc@>zv0%7|_KOnG2iKZ;ef{7e?V2R3L6tMmM6y-)?;e>+Aei(@+4X
zP<!_^_QL?e)quIE2dAQ{dY0|aMXh8B>Qt;n9oJ2$OzlJ+*TWcwpP*9zHL6$}WRNlD
zchYI-#<8fCO~fYX#!y_1+LB!ui65W>yNH_bH`D|kT}`nzMQur(?N36D^AsvmFJlz$
zMYkgPoQ8_%E^38QnI?di7(xGj)D{fG5G=Glh1%O?s7!1@WpWRO<5ARtE}<5112wT{
zmRUe_7Wvol%HV>kJR3DY9%{nzs0XK`YGQ%yuSQL{9hHH1QCsu@>i$oy7g1II6DmVD
zQAHlWQBX#@b#proi*|-_L9RmW-C0b=A5klb>TXt=iVCnlD)3RLK#H*$K8ae$D%1it
zqVC^~D#F94Q*s;=@Vc9Zs=7HF)*K(gHdtnT1vPNBwHB4adpHmydzvjN#sT!_q5?aK
zny41FQlDOC!YJgolg%Hk(Y=g@QnMeml9Q;2FJe6Yj4IBiy-jVjM6ECuwSo?)l;<Na
zJEs)272D7Y_n|Uz02N3Ls)%cm0Nu`A`$4NdCZaCbh8yxx11~@Yv<9^`Z=#Cw1AGX-
z!Wc~KYbF?m`g{uNlss?Uikxhx8nu9X=&kc#ub+vyKGx-f2&)TqV{7!qMAX3PsA9}T
z1z3n$@pM!TJ%bAPF!I|u!yg(a>H%{-4t0vUU=Z^=gJ|fOj6oIKG}N9iL2b!fs4c3r
z{ZrVA{w37$^XzYaf(k_+`UBAq^H70~MFn1JU4oi#2fF#sIm91%=$CCG9*f$ew@?Ed
zN4=0P*!~UM_n_i*N+OVh;^ZLZ;w(i4d=``NC(J@uj`>o{M`iBW9P+P$S8_oQ>_R<o
z472cetcU58x>DK$wc?@Zi$xfSrS|%4RMEYR+R8N;hwD)ps6mbM4Jt#o29kf?o=%+y
zO>tzRRz4FI*lN^76{zZcAGLR%V=8`+LD*uDnK%*K(@#N7P>9|*75(uEY=QGo3*PFc
z(U8U=48W790WYFf@^4ht-$2!d&tOv<El_)%iJG7fw#6LO%4eVgccboGh#vS7D!}E~
zK%XC_p%wohYGpSt9_w+o60rlia2)cka-PL>tU<kqJcpPGqfsl0K`kH?HDL~_SO;NC
zd>l2-E7(rw{~`^Y%YdPd!`x0^?0{>rAAW|p7|tJ!umlzPJXCG0Ko_pJR-saS85M{}
zo+;9X*o}TqR3P&)QRjaLjRY=yiCU5GFw>7k6-_Skj&e#-E3d@PcoUWC`yMudB%z8i
z9qVIX>oEIy5h@c?Q43j#fB*cygNF9%JygWi_J)(#kp4HQ72mRbpW){IaMVC8QN`97
zHF0-TEe%H1#v|Am3#~Kl=S$J88`sfjf;&*fa>U;732KGsQ4?H5Rq^+z`){Hq3>;x5
zXogMcC)@r2RI10Kwrak;{vztW%_GQv8yZzyh{11BDGC~CChCC7KqhJ>gKU2o^7?ir
zU?1Fz3gixkqyH$Af!3%DC8HMB8<mM1`}w1z*ng$GgbRAmje1}WYQmkizYn#yHTL>h
zR3<K>GWY{(g||@m{e{X{;Aqotg4*IX=!uD#h8^8B(rHXaMYtU`Pz5UW2T*}kq231<
zP!rUmR{S69J=8)1A2Aa}q888wbv*$U=>4eY``ORkc{Ft1M`JQBMD5K%jK*`Q$p1hE
zQg@6QFbbQ|Pe4u7A9deg)I=jO6vv~sa5gIS%di8!fn?C_d`Uxl{vB%N0r}>I6oR^*
zjM|bs48w`mXHdnp7BxW?Dubu6E?%(LFQLZ$1(mViQGxl6)eFzf%Y%kel!6+l7rHPH
z74Z|O0A9cl+<*$?J&eH5Z2w2psqlQ%j1!5Ps2ysYUiSKM)HucH&-~6@8j5fUDwV4+
z4%b_2us!`7*64BOFDipEn(H%BTeu$e+;Mc_uNaGs3(U9~sMPng{U^|^mAh$p;SyBU
zE=Q&EHQRp!71$nB3M;V%9>>=BBPL+OLNjqDDwAW-6H8G=_c+$YdDex6<ll=6OSqup
zv>YG6*HLf0AF(UmMcvosG4uW34fW+T1ht}PQK_y(9jlY5V)iRCnaRK?`bC(8&!GaZ
zEF%9JxRwiA`M*#R|AJb<O{@2Kv+^d^SX6+iw%-pG(8K71i%^+eW<TG6-t;R_r)xjz
z^qh9nP!U~69h<-jrihxN9_WBBOh*kk0-NIm+h2rQ=^Bj1Pf^eP7bEd5D)r$L%^Nlb
zhtMC0n$NwNh9a)Ozf*{M;3O&omr&LI3;JTcViRz%wH<0tA3)tV(E6CwjS74f*2Ar+
zjPF7+;C9}jp#V<X8@@yh_zfz6AJ7l)U@&@5GJ%9+9Q~H4zz3kl8Hbvn7?tW$)Rw-0
z%Fs*L1`lAc&i@q}fn2zWI;S3!O%a8mt`9=3{1H@O<1q*)qduR7O8N7snplRqZ<BQ!
zDuA7+04h+K_yU{h{C}+m)|uis<#pI!%%H!b#QaQm8avbf3$^#1r<zRUq4szJy6`#d
zgxgRPTte35e1{C_3@tVP1oI(ke2+5nua#xd$ioLvE7^!j<#tTK3e>>0s4WPYW>OxD
z3Op0FvQgLz=iBR_qTY1ZP+R1bo6Ln_L%MCs$-nkC)qc<eHNjw13JXvHPQVzPhI-?@
zipoS4HpW^^#+w+AF^`*o2BTh7GqEMELltQ?w#N&Plm8GJzSGTLIGUqYJ_Z#?5h|54
zQF}WN^)0vp^Klo>z=lr{Bre88yp76S?2{&-TvQ-)us?1>E$C-A4W%%QQIz^lSRe04
zr6?N}&}h_sg&2<WQ1`D#ed%mL-FFD}+((#%=TQ^+%`~Y`##H*<umieh(C9?tZR~;H
zAU{Ppu}|?f!)H+w)uJ-+E$YGBn2v2{nfE~<&ZR#Wo1)j#Mi*+Ux}aXcBTxa&z(}3{
zjWqN?6}s>XR0i&#_EKMw9We#96%$d{r(rvM&Gt{&{_hyd_1M|w{g8>eZ#*`~)wl=u
zV|$(diE~Wq)}r=q6Z+#BRLU=-YUEEGgpFCIR$hp#z}bM&cnEd>71Tt3VP9<ijQQvI
zB2*^d!9YBS8O-l|OrsIjn`Z`&L=|5iM&Sh8Ux?a*S5ZZ@6T9N?n1ZR#n$%7~J+}&n
z;=8B?1k5+5B^otfXLPGr`qR+Bqfie_Mjfl8I0P?XCv5keS;06|5luwBf;XeK=mch=
z=K^zVd!iPSgJGC&eG*l~FD)Sdiu_G3P&dw1RO-eoG!f56ANng%Te2RNx*b>#_oFXX
zV{7~b{qQ<!EAFDUwCN)AChd>vPe+ZjZ4vp`gYR;o4St2{dp>Uhh{I_5nb;D?qB1rg
zV{tVqbJeKKeU3_P>|%5O{n(BE7|g(psM@)VI-U{k7t9I=pe7iKittHPigsWe9>sY4
z3AMN3OH7rgqE<Q(mAOgS0$)I-d>6LGW2lAviZK}aqRFVcD~$*)Jb>EsLevXortL3B
z70-6tud@9!s7zc#9pAgC=fakn8c9Sgq%-DW5voQ$K)qM~YjisUUotD%jy-h)y3lKx
zx!wkq(hTb$)XEA_TQCd#a4QC41-8d3RPFqXNq8GIe%#CE)J(=Co&TLQviYDEb;Etj
z%~njcuE6`aUWpU%Th!JJT0tS<L{$H4?1J}DTb8!coSsK<6#f0EQxm$%Y~er*W`1Wf
z4ZTR_U}s#9s_wJaS`4QDJ@&>s7>eCjo0U9_3Sc#Q;~s2?m8iY`1XUZqVh3!r#%xs|
z{QKYk$IwvqFTw^`f#G-<RU2QSPQ`Cnj#00eftF(v`Zbt{S5V^wuQd~=VKM!D^v4sZ
zE%^ci@akIfuZVxPAKXIi<)5e(_`YhYHv*M`KG+zCqXw9Q!|^H9sW^v2@fPa&>~-e3
z(Wnee#rpUXHp30;$iEs@Tu`bmVi0<*H-GtTjG8D7Q?NHGkXiU3E=6tC6?^>}hS0x<
z%2=b<%&|>FT_1;!;S3y$SKanPuh&ft>_lzB$LPW@Q4`+92&})s{0!F?`_M1K$+#Q!
z{%F3@)JPA^rN0POj8{;Z^WS7njSHjcyZh1TL8BORa5rj8{=ydMz1gHP7PWWj*a*90
zE6hbNoQZmF4rbv3)C=o4D)5`A<Jn+~`4)}Bp8EbTp`jb!K^4zsR8jeCH5qZCi+%<w
z<)bkQccCwyz)U=k+VduFm@SLPNcx>o85n{td>WO}*RX-k{~j7j%@Ndq=dmST#c=fA
zW`2Nhp%49m);#P@{}J2Yidx~@wto;k=^w=|Sc73$ce|;LNK9mYr#p?lScZM@Aa>P_
zJIsoEV1N3{u^nDUFRcHjDXI`uRkuYC?1F8vE2iNDB-PGl)c8N(5KMZD{O8e_PeU(;
zOE?mPck(Y{I0f~hxr|ELZPaP-dz+v!3>DCD)GK!(Dr1${8Be2*qyH|m1^K9ep2t-D
za2NSks{iD|K#bmPQd5fB>(!WpKVUCRtuTKtcpClbKZDxy7f}IjK-JDZ^uvE*5}rqG
zvELqZUvtz}ChsBts^)Yqs918)g%j<Ki?Jd7*RUQ|pw96D^u?2?=fA)P_!BCyzfhU*
z-)n4*P3dP^hoeqcxtoUeauq7o>ri{R54D2#Pyrl9Rs9)M5&eo<ssBFn;%bHJXX9Wj
zKn1iP^@2NY{SK9SuXoIQ#NCyKF3iMW+=q(v7;1%AQ4{_fCu7}r&7PK_R(Krs`PUeV
zcTg!0e$QO*i7xshQ45)cA^0Lj>-=w_5ypiY)P$E&0bIjI=(XRZJ{;@QkG3YGH~sFY
z7fe6YI0g9kMA(@Ai>PC`8TDPU4OLT~m8t>ue=rU0?QqoIJ&GAP#a`cuO5wYxVm*T{
z{LS{m515HEP~!|n1u_Da(K1wR&Bs98gjraDIXeG0Xmr4C@0%YM%Tasx9;!%cP?@-f
zZShZ3^~N7G116(ZoQ2^y7<GR!Ho@7bbH4_g;uX{u-9@)n-0mOd1(S{)>CeXqd>`ZR
zobA^+WX^Rn)LsuoZCNoYpvSQ}K8<=$tVfOWCbHMgG1P*tVKWS<BL9&z;;YPyp${s>
zb5J*IK^Gpu*7yy!L%$Eq^)%GL!%^eR!Weu772sji^$VzpZ=o{Vq}ps*T(#R2QCBW>
z<AYw9h0mc<R)c!SH#lsLOCBnK<(Ps;Fcbg41WZ3-wz3FSoUfvu-(>sOP&IKKmASg^
zqvo6kp^7IQmAYuu0PRtGn}YXYU(^<r<Ab;ZRXcZ3$Ey8@rrLX<GSCmT#bZ$86{EJQ
z43!D@Od2IL7Nd&h9`?tEADIV6p^niw?1@iW525b&JZ4rHhTZ9p#`d@Yo8u{LiPtd;
zLu$+mFBgM!{zuZN%Lfxt5tpEj$#bZcuRtBAH!vQnP?2B5zIX?Hu;+2}qgyuWxe=%o
zPeNsAI%eUU*aH8JK|23IADau!P}Q1=IvyiXDSZJGaTBVT&R{lPN8Q);6SHL{*opou
zjKaOx3qQx1*yK|){&Lg;c4Hj#JJmE)6hER?`X@$X=s(Sh(y$HvzSs(<pg%507ru^4
zaW(4H{LA(|Pnb-^pfa0=dj3IF#>&xMkH#z-o;V*h&?3~{zHR%5Q7ifu)6wfQ^P<T@
zKl;N_0~TN$PC|{h3bSx6s&>9Yy`Wm0G#Th}lKd;OY%b^+J&JlmZ9-o>gc_&@gYZ)f
z#4k~S|A5Ne4fIB@Q>K;zP|r2Q6bwOSEE|=9VHkt6PI>S@3!I2=wzo3=TuPK{`uO5v
z*VqErxPsz>X$9k4g;Pph`CKY5D=017yD0x)U|>>0QgT9avMVVqJuzkPLsNX~)Jfet
zs$}ti&e>OIuQ{@PTK;24wv`sRcp~3bR$fw4I)2iT?FFuqDdnZEX;aF}T*U=tuJUQ)
Ti^rGcPb(-d+xz`L1~vL0f`TlY

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 32ebdc2a..782ae51a 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
@@ -31,7 +31,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -41,7 +41,7 @@ msgstr "non installé"
 msgid "installed"
 msgstr "installé"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -61,9 +61,9 @@ msgstr "Reconnecté avec succès"
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Inconnu"
@@ -176,7 +176,7 @@ msgstr "Voulez-vous vraiment supprimer ce domaine ?"
 msgid "Do you really want to delete this user?"
 msgstr "Voulez-vous vraiment supprimer cet utilisateur ?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère ?"
 
@@ -298,7 +298,7 @@ msgstr "LDAP CACertificat, certificat ou emplacement de clé non valide, veuille
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Les paramètres de la base de données ne sont pas accessibles en écriture"
 
@@ -328,7 +328,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Database Configuration"
 msgstr "Configuration des options"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
@@ -373,7 +373,7 @@ msgstr "Éditer l'utilisateur %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
@@ -408,7 +408,7 @@ msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
@@ -508,108 +508,112 @@ msgstr "non configuré"
 msgid "Execution permissions missing"
 msgstr "Les permissions d'exécutions manquantes"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Le format du livre a été supprimé avec succès"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Le livre a été supprimé avec succès"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est pas accessible"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s n’est pas un nombre valide, ignoré"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "L’extension de fichier '%(ext)s' n’est pas autorisée pour être déposée sur ce serveur"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossible de créer le chemin %(path)s (Permission refusée)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Le format de fichier %(ext)s a été ajouté à %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Les identificateurs ne sont pas sensibles à la casse, écrasant l’ancien identificateur"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Erreur d’édition du livre, veuillez consulter le journal (log) pour plus de détails"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Le fichier téléchargé existe probablement dans la librairie, veuillez le modifier avant de le télécharger de nouveau: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Le fichier %(filename)s ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Impossible de déplacer le fichier de couverture %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Le format de conversion de la source ou de la destination est manquant"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Le livre a été mis avec succès en file de traitement pour conversion vers %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Une erreur est survenue au cours de la conversion du livre : %(res)s"
@@ -622,175 +626,175 @@ msgstr "La configuration de Google Drive n’est pas terminée, essayez de désa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "le format %(format)s est introuvable pour le livre : %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "le %(format)s est introuvable sur Google Drive : %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s introuvable : %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Envoyer vers Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Ce courriel a été envoyé depuis Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Courriel de test de Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Courriel de test"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Bien démarrer avec Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Envoyer %(format)s vers le Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Envoyer vers Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Le fichier demandé n’a pu être lu. Problème de permission d’accès ?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Échec de la suppression du dossier de livre pour le livre %(id)s, le chemin d’accès comporte des sous-dossiers : %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "La suppression du livre %(id)s a échoué: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Suppression du livre %(id)s, le chemin du livre est invalide : %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renommer le titre de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modification du nom de fichier du chemin : '%(src)s' vers '%(dest)s' a échoué avec l’erreur : %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Le fichier %(file)s n'a pas été trouvé dans Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Le chemin du livre %(path)s n'a pas été trouvé dans Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Format de l’adresse courriel invalide"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Erreur lors du téléchargement de la couverture"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Erreur de format de couverture"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Impossible de créer le chemin pour la couverture"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Le fichier couverture n'est pas un fichier image valide, ou ne peut pas être stocké"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg/png/webp/bmp sont supportés comme fichier de couverture"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Seuls les fichiers jpg/jpeg sont supportés comme fichier de couverture"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Fichier binaire Unrar non trouvé"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Une erreur est survenue lors de l'exécution d'UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "En attente"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Echoué"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Débuté"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Terminé"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Veuilllez ne pas accéder à calibre-web par localhost pour obtenir un api_endpoint valide pour un appareil kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configuration Kobo"
 
@@ -799,7 +803,7 @@ msgstr "Configuration Kobo"
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
@@ -865,7 +869,7 @@ msgid "{} Stars"
 msgstr "{} Étoiles"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Connexion"
 
@@ -1084,41 +1088,46 @@ msgstr "Modifier une étagère"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "L’étagère %(title)s a été modifiée"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Une étagère publique avec le nom '%(title)s' existe déjà."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Une étagère privée avec le nom '%(title)s' existe déjà."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Le livre a été supprimé avec succès"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible"
 
@@ -1199,14 +1208,14 @@ msgstr "Catégorie : %(name)s"
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Chercher"
 
@@ -1226,102 +1235,102 @@ msgstr "Liste de formats de fichiers"
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de lecture = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Erreur lors de la recherche de colonnes personnalisées, veuillez redémarrer Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Veuillez mettre à jour votre profil avec une adresse de courriel Kindle valide."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Le serveur de courriel n'est pas configuré, veuillez contacter votre administrateur!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Créer un compte"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Connexion de secours comme: '%(nickname)s', le serveur LDAP est indisponible, ou l'utilisateur est inconnu"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Le nouveau mot de passe a été envoyé vers votre adresse de courriel"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
@@ -1398,7 +1407,7 @@ msgid "Upload"
 msgstr "Téléverser"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Télécharger"
@@ -1565,39 +1574,38 @@ msgstr "Détails"
 msgid "Current version"
 msgstr "Version actuelle"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Rechercher les mises à jour"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuler"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Voulez-vous vraiment arrêter Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -1610,39 +1618,39 @@ msgid "In Library"
 msgstr "Dans la librairie"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Trier en fonction de la date du livre, le plus récent en premier"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Trier en fonction de la date du livre, le plus ancien en premier"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Trier les titres dans l’ordre alphabétique"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Trier le titre dans l’ordre alphabétique inverse"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Trier en fonction de la date de publication, le plus récent en premier"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Trier en fonction de la date de publication, le plus ancien en premier"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "réduire"
 
@@ -2487,12 +2495,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Trier les auteurs dans l’ordre alphabétique inverse"
 
@@ -2981,30 +2989,26 @@ msgstr "Depuis"
 msgid "To:"
 msgstr "Vers"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Supprimer cette étagère"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Éditer les propriétés de l’étagère"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Organiser les livres manuellement"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Désactiver l’ordre de modification"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Activer l’ordre de modification"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "L’étagère sera supprimée pour tous les utilisateus"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Partager avec tout le monde"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 58121e6b00bb63d7a8f3f1d9dd7e93db98673cd5..84dd8c56cd89bf6222f7d80dede030949b9a7f11 100644
GIT binary patch
delta 5846
zcmYM%32;}%9l-Gofsh0Ugd2k75W<y^kc1!s1qB2-tR)6P@IVo@3I&T&5BNtcB6tjk
zb~I`oR0_6El|u{IqKH5X(t;Lk3tG=s5UVJNRH^-bc{@`k^Z)GbdvA~5{`NgR_*&Z0
zZE2}@TQ`0v@Narr2wiY&Gi(3<cSrjW`ca*SCHNeA-$87RC$SEjcL-quUWH9?6E?+{
zF&%eeHtxpe_*P;nd`Q6uzKAz`9Zl;PLJsZCu_fjqmqMRdABJ{Vi%#frY=O699xlcT
zT!l{buh<qp#XcB1g-{q$tcpSr^$U@|Fq@wYycb=;a&+JZY>ex$4gNOPccUxXi%#er
z?17)41GVZLLOBjbBRB(VumP(XKkTPaip`mJFRa0KI1L^6Hl(kx9Jw_-8{2oH5&8!@
z;eW^L$FY!lE5hP)6=*+WaVkzjC%OYucDRp%Av%IS_&v75!ZSk1#R_!h!_lppjfQ$I
zR^dYQ{>^Bv>_#JU3JrO7*W~_uG`&jE2o3B?{0;q78eGZG&;eJVd%g+{`3snjn~}fp
zcYb{CB)al0T(sjeqh;vxgV6rQ#P-Y3iCvFw?JfDK5Hcyur@;^{LhDbUky(RTxGi4a
zgHH5gB=N&B<S#TUNG8??jo@f>;x{6@5oV(iyC048qv%9_lcL}ry@al8KRWO+bfA{>
z=3aG0L);79f*LgRL-8EE8C~fH^tm1A0Q+P62WX^@VI_Wxj+ZJUjwaiMI1Z<w9jrt5
zXe*AuL)ab5&J3Y9)}fKAM_0NSo#+GTRy=~PcomXPVLdv*y=YE+fJ7!0PEe?&p-s1>
zgKN>5-h_61Yiys7ZpC6Wq$^_kb7;q#(Jg!(4e>|l9-lxb`aODICadszXUt;!P#PNs
zU=uEkMvvh|=!$N`LAVfI$yVeY65d58bOOzVwBjU^9kB`ZzUV@#(1{H~x1<)0@Rit!
z@xzZPa8klzbjGVO1E0gj_#!&cOX&6O*a-Jv8ScdbbidAnLaf1Q=pH|T_Ok_jZX0^v
z4or=wkkvCuiYaKQmSO=ug3fd^R^T789KS=ipp-D3j~Ac=F2w=38yzs6M9IWVG#7Hw
zW0@Z<>rMQ<VF(SrQb(Z!PKos!&^=3`*}p8-pTsQc8_?&rU^c#ihWH)Kz{6;=9gSx6
zNv`Kbd-fsz&a^)b*;s?la0Ge`>yZ2mv(Sk?h<5lm67{eSiDLL0cEhxiB>RhT6!i)m
ziMONuZbOgzo9M(pOHpV_A+0o-Sr!_B_UH<_M@z67^-64xL(mD0#THnHF5v1|pNU53
z4jhPgqg(U}I^MVF^QrW{$&8w#SzC-PumqiPO>{KoP`?zN*!Adrv(OdI#~geZP3G0;
zecRE~@jAMdAEFUFjw~n@vdfatwMS<(2o23}^w>;{&O$r52feQWbMUFyz77khzlIL*
zG5TWr586*FGFN+|$9E{^dj2O-@PQjnH-u1+KDZnmXbrlOwOEN8WBmv^fv?cWHR_ja
zK_(jFHnE<EK3|M2u@re_gtM`+=l^O8cpci&40Nx5f~_!xzT=n1>wiYyVEd7=!zbv(
zI&nrlrsMb_;X^$-(67;c_hBx+9X*68XY?%vZALE+n1^;;g0AE;bfwpz$u|cL;hpHp
z8shbp(dUsa!^_wczeMlLt4iLWMQH8}sUrS8D2$`Qj&DW>T!7AW2^yKl(7jt3-4xx2
zZqXrhg<qo2e-qn7|D>NRY)yL}dc7}te|3N2?>Qe#Lpol9#W)##U;#SQhp;U^73&+L
zJJ6N=1&!PRw4WpB%D+JW%eqrFN0oa0faJ5i2aBjTN}ZL=uscqnVF1p+2ho)^;_y0f
zGc+d(&`6Y^@Al!?2CqgZIv0I4FGQbPiB9ZA^uC>FZX7@tp32~@;8(2>*`{y~+QCg&
ziVq;s48KE@=_vYQ>A)w^H)A1^e_;f2(!yNqjH}U5zltto7dqiL(TIJC9X<aiDR^V+
z!AT@Kqq$Imj1>l=$utLvW>}3Q@g1Cu-OuJzjd!Bg-#|}GCO-~15({xU7T`Ux{>*9F
z|J@XPLw$x0+;~V5kz6!XeK8*=Au|rQ;(fRrU0MFnWT2jCs7IpDO~iJ17yA4oSdN>}
z2p-0q6oq3HypVowvPV_O;=(AjgN0}ZkH-2-=w9waBlIznPoaR1x~FC$`rMCVy&jG5
za<rcYG@_d^<=%cq!IcyZOIFYaJ5e8uMrHzf{%4@~-GL_KLd?cxvHlnqQeP9>ccBCB
zM<aV2jZCBANe+|_kLSON29s+FnoJAO8E!xy{1+DCF?0($j7W}GIeJVdp$oYYN$ju^
zd*K1h!zSk^$FdMT72UBh)|^lLFQ71l2Ko+*(GLF<Z+t)2zeYRCBJ(_E-EkaNqAR)+
zJ(kbnHTW7Dx!$9aiJgm+sNaI*XV{BwaZZZSUEvrsq!ZCSoQCf4Eof3LK_l>JY~O-z
z(HrP-JA$*Y>F6Z6ei~g6y$|jG=V<>=VhN@;P;f=>qXT}9T`_%3GH?-QQLn@%csBON
zVdytwCN{<S=-%IrnYacyP+=|F{}(t2|BG&6&DhghlnS*J9C#j@EX&XptwjfZJ^B{9
zHSeJVe}%3joqaG8?a&C7q1VS_2402D@Ot$Ao6&w3VY=V{WfV$icnDp=t4QDBBQ&Y{
zU6{P-rlS#9f{kz~@)uU{Q->d5DW3I%BqG!CJnA#iTv&^o)bNMco_!JhGJY6Gp&Dl+
ze_;(j<MAXq;MgA~9gfEq)GtM|_&T)Xd1%NVM3eM!Y>u1I_rMPH{)5;Gk76!1Vvv*}
zYD>WjdFWo2pj%Rfb~FmzlDg<DbPw;1K8-&2d$i;2=xKNxd*SD3ws)#c-XjyxNMBP+
z{D)9jM1!H*iRE}a-dKEb@>T4QSJA#4+jt$jU>0$&!eZ=(lkp6!$F}$jbOGzpJ%0sV
z=q_xD2kMA_Hib{)g|D$S^`;Y&2Row=_CP1v4>{UlHoD?XXy~_M1@1zV?Gze;tV@#Q
zEX4NI2ccUu9(`_Rih?tliypg0=mdU=Zp|h<J#);bzAIiojCObmU18gaNe&fa4)uv>
zzt^IXor`6-3XQ;i^uE+TDLA9!Xh?H;P4&mV*aN4b?f0SgJ%i@L_E>)p4f%K26FXm;
z)Q6$ZO+}C8d^BP!(f7hL$O2R06AG^6^LRtX<YeYK=+<;aL)r@sS$}MY=b$g5i(`8V
z9pD}`VoTA;G@$*jMqlw;&{LH@#R#zfSrpv6jyM3vph<WaR^tXN#!u0YM(fLx2z0;#
z>J``#Ythi&h~7UB2jbJ{Lf%D__fYf{c4PdIdwH_LYBX!l!!CFU^2H2uuo5?-kvM|A
z@EdexMOP#fABgVhY;@)IXg~L(?~PyKnYa->EeFy6w+LxhCNrzV4%A1Yp}Yd^=vwTK
zbFecupc8o^x)ojV9yCJ7&>T96Mx<<NvSmZj{wJUjn>m#f^M*w<*x|$I08gVKdl~I`
y*VOe(+PCSnerws`j20E8<^4*_s|)&7)s$DR*jRlcZQ%On2TUqlKXg);tp5SksC3u>

delta 5948
zcmYM$3wY1h9mnw#auGp9(1b{SX^4nKB>1~VT15~<D^Up}!M~`8OVY=b?kC;KgP?m>
z)o2;2n=tF#V#e46E!|vdn2E7VIyKRjUX;%E{^WO_XC6;p=bYc~obx^3bIvdMqBfxJ
zM1cF(Hi7F6|7Hdl6N7nSs{Q|8WqV`Nsjk5kJcfGj4z|J2CydF*7@U9$F$hm%2%f{H
zcm<o|HEe;Oc)I331$8h{-V4Fj2y8`j42ENO<W)1!*2kj;oQ?{p6kFnI?1)vEfd^25
z-om!{2)kqJXk+4yYs?@DPtq_2`EM%t5sYu6R<I2<@lFiH;~0q_*!nfpif*C;YQV1e
z05y@*!I+*n8kNCUZ~*Q^AM=}f3aJ=F*xhgxw!?DN#H*08%r@jzbHuh^L1pMORKSnz
z^B~d@Pu)TF8-f~VG8SVwD$vX5YQVoyP>Q}obqw!BdN3U$a0n{$Jk(ZIpi;d8d*gc4
z`)5#R<r*p@En~fucR;<LhB{uEs0@vaCI3qO0vfcEH&7G4i`w%8sFa_?I6Q;=H@Eqr
zexWpK<teCvds(wk{c}*`O|tECQGqQ+ZSC?n*O+D$*3zI9Z9vuEM`h;M7>XC|^XsTU
zzd|m633R-`I-&v_h{|9gD)6Pqu9yl`1~#EGy$cn{QI~@D=p)ns^{9yh8ATJtq4uf=
zD#iU#TQCZh`f)fIUqh|*1ghU<)CBdm{T?b)fuyY$hN0$jvnc4WO~El(jvC-NYL719
zF#Hy~U{-=L$>>LA>UGpgt5AV%Mr}nkYQ+bTV`XYl0p3Ji!+S_(TocmSnDI0upaxik
ziu6?s#Fe&vEov*OP$_-awjV<cd<M0Jb*L17iQ3~3qE?{csQ02!&yz7!_dnA%WMdEy
z3Q^av2o=yO9Ej^tE4hGtL(E-NKp~0VS%^SoG6{olFb3mLRA4!%Et!tW@O+GBe&bT$
z#+WKp#0N1Lk6|F5LQV7$>iH#Xg4Zz(Z=!>(*{>m(jsvh9wa4$H#yN}XcM<j8WptmT
z5S`>5iV{?+wxEO6s7TLX23|#d$y$&eZ9ygu#{$%ZTd*%)LroaTL1~6jsIw4{x|V6y
ztYq@97jkLPCv_rf!V+6wg4(lnsMEjI*7ss4^%JOmXR$f{9hKq+49173!xq4IShhz!
z?{4kao%}1(VKiufQK$&>QP<Fq98|Lm73g-<K)aEwo8w3p&8OHIBT~H6@52$)hhR3Y
zMvZ$Bb>07g3j9AVg%Ao6sa|B!s0<{cR?x>f2*ap9gDo%@70_gCiGI`q%541ys0>wN
ze|!_QMdwlTh4t|IyO9(WQ4H$T`miMqLPb2vT8OQvzlaKKG3vc#sQzoQ74ASC=7XsB
zE}_1Zb*QbpkIG<BTH}IT(}99gmxx+X4k|TysB1IJx(u}yZ=nV{f_ncfw!$m6{S$Pk
zKR`_s&56~u?136@sC6<%>He2f(12@D9e!%-`%xWFp(d(Bt*9P*;T>Cd(!Bt>Vq*qT
zTQLZg>TFxjMfESla4g0yy8jC(=n!tOzJnTQD{9Ywj;(PY>RW%pK5xpM)R!z2iN(aA
z0vm(;Hx>Ng0+{{S1#h6n4dSH;3`19iP81YTnl%eGVJ>RmBGgKLj7oJC>JaWgeF+bs
zR(94tzhwO<Dv<k_go(Yq_i|BR(h0rEzYb9u4PCJUHE=a*!WvY7M^PC%kJ`ga)&^@(
zA8(5~p;nlP>YrlUd!xq5#5R~~pHJ&U{?*|{8g$?1V^ds>iMS5cp#~M`X>5yEZ2gY)
zAu0pSd|u|lQR6tMm3PJ$0@xZHO?^L~Nn$qvZa?oY86PUb0-TI<a4vp`I($AZu_n$!
zoryeDCW=ts`0ryRZa@XP3-yUUgz9$*wWYUF?>$1D4L6*xf>u5NwI}(=cA15!0e*(5
zcpMe+=cvQfg<pyKz~rE=Wj?0kV&vwTUDyGyp|;{{)IuJk0uC9}m@(HRQi!4<74_n9
zR3^rv&O#9~r<sd7OgoTln`@Yj5t;mbhXpte51^h0b5(R(2Ju4^F2Q)*hz=fUth4{u
z?SubfdmhARc@y`;80y1NshWmyxCRyQZmh&psFjU>%A061D%DF+{VK5?9z^y3BkEQ)
zV5mzW_G#~0C7~YlMeWfnWRYemYJfwi0nXX_XQ=mr_+_pPMI-0R<e@THiR!o6*7u__
zd<r$rS#*`syA-sy@y~cGnSffsRE);?sLZTF-T$qq75@r#7!P4{JZbCaF`jyzZGViK
zFm$Mw*>0%J_=a--b#01i=!&yYhwF9JVX8p|cnftFIu7%0OA=}eaxe*Jpswi})Izo(
z2i#mj{uVLe!@a}YADdFoN8O5o;p9J%LMaU+u?(5Z{1!D}6Hb_3Y=^2RV@J$HU9$ol
zgELVpI)J*CH_?v|P??)D!VByrETFy<Ij1JjWmfI+5Y!4)S4t~Ud-xV=k9VTB<S0Ig
z=WP2u)D{Jg@~)eM^QjNSQ2d3p#`-(d_-9b#yO$}XP`HI!QM(*(!UT+^-WN6T1k`{t
zF$fo6GA=^>?%0MQxEHnezrki$hg>XEj~c)8Xz#D-3}g#kQ%a#54_2U7x(9VwPNF^_
z^{9!JXW1OJ6>U)ycSWtFFDerwQ5l+UpD)K?>ThBgZbH3Zjg5c*AEux~aS~JTG-?H3
zBXgUmvEJVKF@gF<R0fV>6Fh<ZHy`jLAKT}8U(6CzMm8cB%xpuQg?i-Xn(x%k`7?vZ
zc>`CVkNSJae^bYg=P>nIZ^C7$0heP-T#GuK@1O?WgG%{_s6%=ITVMm~JMa+oerpD8
zja{(u_rH&VQZ&Lo$VE+5gpD5})Idv7Te8x+9d!+lS^tdc_XS4ax2W3?Hs0If1k_<4
zgROAYc=lhZuA(6e4`V7m!k*YI&wH^DCsUt|)9@5V>N)w2!A$Iph1eO_VJF;=ZSiB&
z0{(?MLtmmY@Hn6Rhf@fj;C;d3P!E!^4Gu(g9E<8W2^FXxv++IDiW^X={|YnkG3v0T
zKksEA6LmQAu|3X1ZP9X<f;w(P1+oiu?GB>?_zP-l8n7{PjHCY8K98N~4VaD!bOib^
zAC=-t)VOb>GP?`Y@G9y(H<ZtjR{RvI!?UQ!icqOtihZyOyW%<9{tfEAwuRoA=!vT5
zpi(~*lkhcL|0Qa?KcKGXr%2{p(_)hMfoO|b>3CF%3Q?(DfLg&~Y>q2YseJ>Lxh>cZ
zt5F}MW48S^s{egd<{qIk6vRQ&_-#<Xe@r(Dy3eJk43wkx@Q2tJYfy*rE-Gbl-}C-9
zoPhe>@d|dpSJA;u7==esnZ1IEcnkYu_!Ms;BQcWsO`Zxk3w3&zqE@&Sb$WMW3?4^*
zlbRdY3lpY#?>&#*s82_&Yz->#?WhISp;rEH)Hn}N-;Z`h<X>O31PYos8`H4_70_mU
z0{5a)c?LDm$JhmLpjIAK>;>XjQ&21Jhsw}Y)ESzA%E(64mhCDgPEGK88kDlD_Jw<>
z3^e7kYl3jp-Y265?lW!Q%k3khW1U5_OG=z+erJZi#9!{8;k+<!p;JuLOJ)9rW&2j7
zeIDF0JvBWeH6z1G??0fY?<YU<eG|}c-_pJX@xG^>`SVJqJN^=S&2-97?kO#u?aZBB
qI>TQ&XSP%Ja_!c+wObb!JGIqiPHoM?+L}3YYOCY-{b^#S(EkBpO`Nv?

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 6012214d..9d27c92c 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "nincs telepítve"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statisztika"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Ismeretlen"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
@@ -282,7 +282,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -312,7 +312,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Database Configuration"
 msgstr "Funkciók beállítása"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -357,7 +357,7 @@ msgstr " A felhasználó szerkesztése: %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
@@ -392,7 +392,7 @@ msgstr "Az e-mail kiszolgáló beállításai frissítve."
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
@@ -490,108 +490,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Hiba történt az e-könyv megnyitásakor. A fájl nem létezik vagy nem érhető el:"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "A(z) \"%(ext)s\" kiterjesztésű fájlok feltöltése nincs engedélyezve ezen a szerveren."
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nem sikerült létrehozni az elérési utat (engedély megtagadva): %(path)s."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "A(z) %(ext)s fájlformátum hozzáadva a könyvhez: %(book)s."
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Hiba a könyv szerkesztése során, további részletek a naplófájlban."
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Az átalakításhoz hiányzik a forrás- vagy a célformátum!"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "A könyv sikeresen átalakításra lett jelölve a következő formátumra: %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Hiba történt a könyv átalakításakor: %(res)s"
@@ -604,175 +608,175 @@ msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "A visszahívási tartomány nem ellenőrzött, kövesd az alábbi lépéseket a tartomány ellenőrzéséhez a Google Developer Console-ban:"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "A(z) %(format)s formátum nem található a következő könyvhöz: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s nem található a Google Drive-on: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nem található: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Küldés Kindle-re"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web teszt e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Teszt e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Kezdő lépések a Calibre-Web-bel"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Regisztrációs e-mail a következő felhasználóhoz: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s küldése Kindle-re"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Küldés Kindle-re"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "A kért fájl nem olvasható. Esetleg jogosultsági probléma lenne?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "A cím átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "\"%(src)s\" fájl átnevezése \"%(dest)s\"-re nem sikerült a következő hiba miatt: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "A könyv elérési útja (\"%(path)s\") nem található a Google Drive-on"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Nem sikerült"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Elindítva"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Végrehajtva"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -781,7 +785,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
@@ -847,7 +851,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Belépés"
 
@@ -1066,41 +1070,46 @@ msgstr "Polc szerkesztése"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "A következő polc létre lett hozva: %(title)s"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "A következő polc megváltoztatva: %(title)s"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Hiba történt"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "A metaadatok sikeresen frissültek"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Polc: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
 
@@ -1181,14 +1190,14 @@ msgstr "Címke: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Keresés"
 
@@ -1208,102 +1217,102 @@ msgstr ""
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Hiba történt a könyv küldésekor: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Először be kell állítani a kindle e-mail címet..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Jóváhagyó levél elküldve az email címedre."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
@@ -1380,7 +1389,7 @@ msgid "Upload"
 msgstr "Feltöltés"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Letöltés"
@@ -1547,39 +1556,38 @@ msgstr "Részletek"
 msgid "Current version"
 msgstr "Jelenlegi verzió"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Frissítés keresése"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Frissítés elkezdése"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Frissítés folyamatban, ne töltsd újra az oldalt"
 
@@ -1592,39 +1600,39 @@ msgid "In Library"
 msgstr "Könyvtárban"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "csökkentsd"
 
@@ -2467,12 +2475,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2957,30 +2965,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Polc törlése"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "A polc el fog tűnni mindenki számára és örökké!"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Nyilvános polc"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index f53f178d6988a9708ba6127dbcc2aac6247f86a9..4a5f451894f746b0bc97959e24d5c5606024ab03 100644
GIT binary patch
delta 11829
zcmYM(2Xt4(w#V@UDI}0y2nh)(q(KTPltAdAML>G*5WpZxl`enaDn$fDI)>s!no12F
z<sk?`q>3P*AWxK{auMm`mG}KIv(~$d<!5HjIWv3q>~j*hzwLH=d$*hGYLNRPhyPtH
z?KqM6LwWW7|9?ekjuS?A1!m$-tc*7?70acY=W;NJeka?11!L&Hjn!}+df^4^gg;_u
z$8k9|xLTWmcQFT#q6a?52I!IDIAyRYx?yWnK<zLI3$ZNDM?Wk=AN&MEa1ZLflXm<e
z>b}zK#)tKtKpI-G5^AD&Yc<r3b<iL4Q2}&A-QNop$N<#NC!+3~i<)O8Dx(`Q4v(TQ
z-bUU37(-d#DVyau6)^@Cd0mXad<?<@<c~9!|9Ioa7=$}eDJ?+-dIq)QA5j^7fORoF
zo2=oh*b?_*Z}g~6{#(%~ppk;xFcz<%B7Tl4hqxN%tZQQ^{XrOxlh6|vV>w)b0k{!$
zWcyGVI)uu|Wpu}1Fc^QWLH;%H4+F}8TTPRJXpEtsidv{OYJ$P2vmA*EcsX*M&QVk`
zKE^s2U(0c5I(<+_wHWn$5mL9#daQ!yYmxs@8qXQ%f}vDk7`}!&g12pdH7bxj7=_>1
z>wnnm<;b`0uZ%j1`lt=H#sn-xWojPkzQw3aZ*$Q|rg0AA@o#L7v1}s{3sE;t#Bf}J
z3UD{}!_&5(nQIovN4=hHQ9B-u5$M7oT#hW^Y(f>Q>n05?@ECP=;Z#frRz*F~02N4k
zY=i}<RIfv&_8h8cFQKaY22wW81Jry~>Y49G9n^h8QS*;S?sqwJX=ukqs3Q6q^Y9PU
zSy!)bim@j~(s!W(D?-+AwxA~d9hLg0sDQorcxb)|)J_wTKTb{lqd>=Cw%-4@Xs8<Z
zpdL7ZD$0vk9<QKM{{W-Wuc1k4I%<dcSP8qM-kR~Kj25BJ`~Yg+Bi6I1fUaPmi^d%q
zs)6U&9+Sy)K2AiX>Imu#FQX=UhzhV&W7GFUWgrO4U^MDGk%W3a6ZM^FhN_)5n2LkZ
zrPp8~4W;@3>c$(WjNHWv=*D>{6OpJLXQPgy2`aFDs0AmX7MPAYij~M8XOr#UL(Stf
zF_{c&LjIMyS_~+V&KQeR&>jDcT3|iuOb?*~`W7qW9n{eTHZ_5zU`6_MQD@v0wUI%n
z*L;HYJygK!nv#DN(^dxbx*SHO@)T;p?@<ffK}}SqnOUeJD)3ZPfGtrw9)z0b4fMn*
zsCj0f0$PU3;Cj^2>~Yah#3xZjaogVT6ctF><|fiG)Y-?PCP>2<9~#?ljUJ5mMjb%`
zR>w)GlyAfOc+6U+g$cmbj7An0dZ2bX7nP9>sL1!D7CMOv@CQ_2zhe|WMeR5&-|R3B
z^;`yeVq;9gd`!a;n2oEDx5?$4qmj(OeN4p2myCI+1%_B>qEfyN+u#w@nTEDBKiyJL
zfsRKlI1{z=t*C`dkW+LXVgly2Ql>cnel)bB@u<kBV^v&=Rq!x+;T?3xM_3l0p(gfh
zZH}ZmX3}qpb#N^5bIsX~<?t5jh#sIX{)OfB{(HS_UZ-eO<aJSz7oZ}Yh|0`|sIxzY
z3iJ}Hh<-!WkkZltB2n`UN6oVob$tt}SiiR3K>b{BO0_jRs)stW7O05ZpmyBD+84F+
zf#{9HQ4>!<e_V_KxDNIFZdB17Mg?5Do%yhZpyuh_j{NIFAp<(giRg#(QLo!-R8j6g
z)xs(C!QW9;{?zsZ`E171uY@YzJme>{(;3U)JXFe;pcY<>3V3UK@~<5nWI+CaTKEZ4
zCyo#K?1Ej9`gFFUzI=b7CJ5_jK1fNZenZ=Di&^vwk*~E=getzPsKDbpnGaoE7mZ8?
zdSgR;5A|g`i%R7~)ECdQvw1KYb$=~vh=r)){1^kV7=!Q#>WD6)cK(wc{{vNoZtO}&
z>++_dD)&QWAO|&3M^vf?p=x3T*28g_i@Q*n_!AYNe^;|$GM1;Gg`t>_IoJnvv`bL|
ztjB74|2NUlLRU}=-9i=5UDVHlXBdW2-ArILP&LpTHDO28gaa@H3o#rgqiSX;ss?tU
z=0AWbcm!Yk{J%#-sYvK<c2E`dKy@sQb&*J&2B;$$hT8cQ)DBl*RV>B~yoxdC--E9o
zW?&s0h5CSPMy+=e!}R`tLqj|H6}8|~R5kx?`>{PuO~j)nY=P-G8*_0VQm@V<%*Om)
zrdZ!ZWwr!4cIO)m#wxwdM(UwU#q%<a80=ylhf4i2RABp2)qETq;eSy@+Mtiw@c`>W
zOk?~AR>J$XAJo^>RzqyYcu!PD*7W84YtgvMfKpPvpQ+}GsH%-ey;fP)#`b!9REBz>
zb~FW56AMvQ{~;>yPwe%5sG>fFI>KwVf3Kg*JmA*fOyrA7SuASdRMf<EQN@#wDzdiL
zf%f_Y>kO>G^@XS!+GNLfqBeL4UmOXl$iH#X&;wUd3qD3IP-cMnR!5@xwXia_LLJ#~
zJ3byG=+DJO+=xkd29=>FsD+{mOa`i;Hj-=muEsQ4Fwha3;|f$DzhF2%L}kE#pvh1q
zYG)a!z;aO6Tcc9m9raux>S+FjT5yT&uS6Z~b~EmB4$@GBC8&wcp>}u;b>nSR${yQ(
z=|Sem0?>`|2&|2jP({@h72pEYJRhJteuN5aBYNOr^wrP*uV`q;-&t>>cJdfiOrC?y
z4gyf)VW>b8Q2}P#@kZ!Lzb#h9E~vL=8tRC4VjP}9&3hliS>O3DjTaNYV!l|3sEL}O
zZfuEKuoLRj+8<TT<55R28};6=MrHC_jK^!}g&u|GgXM=BPeC0`TXgBuT0lciLQT97
z%iuax>NeZ)V$_63P#HUg3g{~8OZX7Ak#a-KJP{Z}KNS^dYt+L1QTLA-LjJYzy9`vs
zk5K)CsJG%GDxiC)h1^~>6Gfm>S`BsmCDepHu^f&>1v(j($r+f6bFm8UxBl`f`LD)+
z|4{pl$7K4$P-nFitLg#NgEue+170)tWug}7jyi&Vw!a9Ki6T_7eS&3i8!EG(+5VR<
z8k*oVDy0`N7H?nzdcAHwsp%L^zbD4vB-GAVpx%Nl=!?auBm2U76cxbNSPswPOLztK
zC3GbZGryzNM%_3L^$Wyg)K9bdsGS``9l;~i>*hP$RCjY!h9;oC`D-x~zeH`|5o+GZ
z5heq1sDRTjkoBER({S?8p9`I=12KU98@4|kGw3fyrLYA3@U*>t6_v^VplahGMq$86
zQ(NiiL;odIZFNCUz5l~$#4s=xHQ`cJs@L0o32KKIFbhkKGG|{MwO}ud!~)b2OvNOe
zhaGV@YGI$zCh%}nCS%c;^_?6Vf!GXH{aw);hojz#3D(7^v)zumZ@2Zd^(JZq&r#Ly
z_l8M*7%CG{sLbV}uIHgk6SktE0NSCdbN~k7>!?7cqN;y3D)ODEiB6!-_FGiSFQd-(
zA?hu9iisFE#>|(G%1}=X!69SFzlzCaFYHBCX$flKbEp8Xpmz2XYJz*H)IUeni04>y
zUl?iwk+z?N3Mds7PzGw}-B20nKbHKfF@=F;rT7;M)DMZA@#gPt?J=GHOzUn`mEXW%
z^q64IJ{)7{*ThWhf(m377T`i0f=@9A3nrSkXoZW0s{T9dj5krKtv|^`+6?s}YJ)X!
zBx=VSFar0Ys`*<~(cQsX82Y9eZ;he!2Vr@fgj#Qb9e1sv5zfF~d*K{vf$ONVeSk{Y
zUsxI4CYzlmq0X>{wHKz+ABhTN6{@C6uo_;%DD)=ddW({f8gn__X(+|7p>|Y+xwspZ
ziTkKjKSQO|e~Jk(0=2UgY=(`n8_q=P&iM(uVArX<+PD>8$K+|In3rIJ-v2LNG)O&G
z<Obh=nG{yR82bHC<I_+@w-Uo}Eh<x=+woJVOrA$&;4Uh2VQ-n#$DsPPFcKSL5bHa=
zXjI4Hn2c*t6Q9Ct{Lvcxw)t1>=2(yM$=C!x!v<Jtx;e5&s1Hta)bkxt^Up-p%IC;w
zI2X{Rh&#<Nkq^U4^k<<W+<-cgBi3uE37(<OGGwL+Gz;}y9wuRb^u%{C2Ir#!*^WBe
z8>qJ=ZWj4}nMTK1rdZaXBHf89u3u3LJxBgHQSX?)yRFAE^v_{3evjVhKHCKDhpL$r
zY=aF@^UXsQ=|`yAIXj#DYo|9E(9Yc7H5Z~#Da}SjJPNg=EvPT!F7(5%un}HFO&Br9
z>@)*)y#SS&QRsv3ql$8s?LT(W=){2gT=QUetVMq=M&nV8#T%&agV#K>gFdL&>s{2s
zE72c!plat!Y>MYm*DJnf{!W;QD&C2xfLse`c+gmls`7Q1h=;7VQGo=^H#^V36#98s
z6^CIOE=L{7G4#bV=!aKP8M}kZu=75Dn}Tp0q4&QtjX?|?Lmfr61*SM!VF3Nf=#KNS
z94<sfz8bx7lkM-qD)bNA{vFg8?=MuKfeTHo)I}BPK=ji4KZl0ig2kv}+lorrDO5^-
zw&M>lfqu{;Q*1e?R5nK4*B$e52rBR$s0|%K1@IFpbH0mBZPms&)_2C!&`yd_)w~u}
zG^ca}-oY#kSYnPQ4>j=+)WkC|5VxbA`_hhIM?L4a)CAZF^*Xo1U>u6BP#RNcgy3S-
z1fQU4;5aHH_w2a;GE<D{Sf25=sG}H+di_RY3{FM`v<kJ*HVnrjSOI@TW$4K=@*hOQ
zd%1})67@hT>V}4>;%kQrbOdUm8K~FsL#&J&us5E-2u%5af7HNc*a;V*p8pM1e5H!a
z(bd-v8wJpr0aa@us(Qzv0+^24$r6mgjaU|sqwYJ8%G`BSCZ3?)29Fg4kJ;AIm`;Bu
z>iW;9*E7hq(lolFcCr#xWQQ;lZ()CoSY-lv69>|thYIi^s_H#gn_9`hX7oE?OI(f_
zcmpFb>_Zc1b=1aPjcBCO=!lAFD(WmttY=X-evdi$A5<!n{%!ufpdL1$|2EddBdF*9
zMmO|aV~(~gs<<OiwUdX{_5OFKp`w_FigW|U;w97$pILoAGO3Qj%8X~>RP2mQ<Xl9}
z<Ga@UbWFr-`UO}Em*OZqgZhp%S*H({iz=p}v+s&}4F{t;4oBVihP^%&75RJC^{8Sy
zV6R`o5%h0i7<ON8j%p-o{)?#MzKII-8NT@c|3WsH*DMj^xX=W3B!f{IScnO@7WLrQ
z*cg9C1(3ASRC{AoQO-v_w+a>TR@4Wo1eMwEFbSWcOA*C>Y<^3vf#c{e$Nm`ni7A>f
zsJCDNDuA`92@lx*DQrgnCf39BPx<#=9E!@s3Dm+rV^j3pWM0Eoo5;V;aux$Bs!gb!
z9!5QQ8}&e`&E|pT=t=)AQ~<M4JN>|pe~Nk?i&2?5X2-8%8T!9sZTu6{F?9>)uN3vz
zVip{UTHqaQiStnbTtV%i@>X+1P0^43E2zN7q86NkFXIN=e~el<Xq)*}EdqV%_d%`m
znu~@a9*rqD3$^o|s7##10KAX7&waajFdVgD4C+X7F%3JS7fwTOoQ-vG5w^iI_IgaQ
zIZ{^@8j3I%OJg1?Ma@tXPeB#sGOUE3VLpD3JuqR1d2Od+bNbt{HU5P<+7>&_{6kTn
z?$H>6bCLC2&Ker246HK)&N<AYe*ra-_byXhU9bcFmDm^mL<Q1eH$NY61(w6RI2fN{
zC=S?TUc2$A%*?@TT#RXY|Bus9>YreFjNfZgmW!(DF{spjj;ik8um)DyXY7O8=^|``
zdr`IW4|c_v{pMd-#$z7+J?MddV_DXBN`Gd~!WV<+M_aQ{J8Fum)^?}>r(hs1LH#h=
zh}!86tboTc60c)0I-i^CA*iFSih4c^T^eX&Z)k<l^!uY0o`&H#*SZ12=pV9PM%Bch
zsQUvCm;j<sJFJNsuZt?;78r%yP&F|20QuJf?=ldB>rgu=L8bT_>deajj|n8&S{rpF
z9Z<D16&v7YRMr0nwZIe927M2jekkh0RuwzpoP#ct^6LyFGVlnM%BU~Q8D^tW*a;O_
zA?m%KhLvzW#^YAhedkf{^=;Hq{ecRk%psGJNK_``Q1fKFXz0uvqZaOjI@4Ft7suHC
zTj)lA9`?co*cb1icG&)~$y9e#>Ia}QQ)v5(Q41HL*4u>9=sHM43tvM;`Uo{axi8HQ
z0#Q3lM%`D}_S>UUJqYXJaMbI#8I$n|*1*^!<`<4GsG}}G?R+xE>;0cY!-IkC_QD=i
zge9nyUq(fKA2osdQO9YBl~Ch-uo@0WO}rWtaSN(OE}%BxUSfVzs(=af8)Jyx|5s?J
z$lgRxoQ@GV2Nl2utdC!y&fGa>{!SQ;wdwXi-M0wq;AVUMHrAw{@RfOedtxU2*{Jc)
zHO~6Z0~*>v<>TfznGTpuf2Q>_REqz=98CY(>})V9#fwlo{2IORN6f`rsD<KBnEQI5
z=9!Om@ie+Lq0dQ^vZk0$e<*5aA0TJsoX1rB3q3IDl==3jVHx_f&==>UuCGELTx+jy
z$8z-d+3QD9AD|Pb$bSlrs|>_p+0*8)(`lGSe;6t=D^MSvljw%Opo;M}dgF5}i{58U
zKq2TyKN9C*3I^bQY>X$+9sSRee}5VwXU(@e9(6+@>J$2@?SF+?^nJcDN7De4>5oFy
zL=h@O`%yJ?3-$ir#nR|`&K!}qH3|b6&venyPVz7jyP*P_f?4<;Ds_iZ51hte{9n{r
zKSTxc4`yQ0x8`@dZm4;tqOQ+J9nn6_#$%`eU4PTigTd#`-~XH9OZ5ApGVv*Dg1e}l
zRk&bkA{v$ACa7ZTfFp4p>g-E@XO6-jwXrY^!ulAB?U2m5oWV3S(R7T%MOYd4pcecA
zHNkaE!m=05^(@qcol*A{qINhORkV{)8Crv?kxx-Ivddoo;zghHzd<9G3-?eH246DO
zpNP@)`=Y9R3TmR67=`bnig7Dy!5yg7UcxZ+y=>-7z+n10sP987+n<3xdjCJ5p~yC%
zs<Ie$c6(5nIfmNdcNl_KQTN|R)y6-l=gNL>0`f<F;et^C*TxvkvlgI}klcURuve=T
z??`)?TYR!`f}d|zT1IACM$MSa>UA=*i#v`BE>)^_@hju2zg()rf_t+=im#V=h5R3-
CxS$09

delta 11909
zcmYM(3w)2||Htv0ZDyNocCgLHe21CC4tBr{G3FHJOiP%xInE(AGpa9@m?8b-P)hn)
za!!s(a!O7mkwkPrN)D-iIYjk)y<OMi@$cc$^SZA4zOU<ZeXh@aZ))Zak83+T+}{R!
zE^_$iY-Pu(g_pzB`~QE|Cpb<x-3^$G2eBUB!FY^HG|zRxVEP5NKLuU%7hw`^$EtV*
z`{S=Tz;WD8N3OPH;B`#Luh0tvn>tQgtbyLxA3bm|DxhH)ho$I?Z(#tg$7;9>L-8=`
zz6*BTi(TlxV64XaP7Dn#n24Gv&Ds`q<D(deIj8_eq3$1x3S<&$=jEvTmZRp`h|1_r
ztczcvKi)&#@14TtSl@}H5rs`rk$1;P%)wwRLjE|j_?HiUfWi1NDy3&ofqswL@vo?i
zdZs!~YkUNI;56)pM{o$%NF)E<X%x|Dg8MKAZ=fO$Z00yBhZNLVcf}ew8EfKPtb(i1
z4>w?S+=)7}qo@p>L}la`^u#|g1pjJA{xuNL++-jGm4PI5VQbVvgHaQdpw99+RKRPI
zV|Bhl1?b(vaWXIs8FI#>j%pR^`SnQMIy<lt{@8;2*Pszd<qgDG4990sN3h8DH=zPK
zjJ5Hiy{<g#{wUP_si>pKMjh#3jKxw^rrt!|w+fZ%eQp{JX<WkkSdH*IV=@L|DeA^@
ztce>?3m(E@_?_)%wlWLkpkB{h)Q(@kNPG!{aV@fxvl~^c?mINJfH#$*vulK*n1Onr
zCn}IU%)}y8s<)$3dkJ-9S5eh{8z~>hvyGXrB~tLtqp16yM$KP_-0yal)6kCBql)Mc
z?10WA=B%?&#aM{7@Fi4W>yfpbJ*bHvpi=L{M?(Qepyq3g+G%s-kJE{NDbN=&Rqy{R
zG*pd;Q4gF)73I$uhBr{D_iX1lbub#0(nnAk%fV<IjS933mC^O6Ge3@+_q6o~R6sW{
z$W7yK8mfUn^4kZ~u`8CNQgs@&;4i3&yxN-pgHZi2R0iszUb`gJccKOA`ApPzVgRak
zhGIOHpj)p&1r5Dc$5A)lMrGt*jKC1iLz#$2?YIN#DEgrSdkVGST+{-KQAe>6`Qz-i
z{YqJ8p6aMf#$}OzrLHpr3S>CO-~#l-&8P)-pw9FpDxk|)5C29TO-x4<SSyU8-yL<v
zBT*ZfjC#%ISXZC|-rkY?tC;pOpx5OTDwW@&7QBX9;BVAK;hoGvO;CZiMg=$swd2XC
zd1hi2T!5Nq2`Zp9s0{8v9nE1k4MltbRTTH^4L-aQ3M3L0X&maTlTj12K`oeV`-9Po
z{y5YT6k!_9MIGHf<OOlQwuW~x0k{XyNa4a5)J~V9GV(qu@?)rlE}#OujtcAn)<&PM
zX2)@;9j2h3Yll^^55{2*Cg2QA#dnb!a66Z1G-SZzQO9Y3@z%bm1*Te;qEfycd*W%-
znZ|ZAKiyiP0xd%=xD>VXy{LuHAgAbfbvK{nZWylj|0x>UQ5h=o#n>2EV<S9;Rq=21
z#40_^j{Q&*hoO!n3zM-wX5cL32c5GY{qQd8h&;1RrhGAs^_>VBdYzI`k$2YxEW%hU
zM`h+c)IwjQ0=<eVqWh>Cs!m$^VmxY|>8N>Dqpt5k73(+F+vsk^Ku|BUqaLU;dkhuv
zP}GjcSSO$_{bKaN>8Oe4U?8r->bM>C{2^4)ok9g1+}nKE>Z9fv*PHz7LMa0}%W@3B
zw@|O!CR9;=jH-oiu^K)=Rk;tJOZ8*0J|?1yw=eP&+8K`C_$K<}JE(=Xp#t99hx}^?
zCm4{|Q43ckkJO7(3kTvzq)wf^sH5`jXC{b4eUMt%elOe4#T3R%k*~J19#wodQGuuR
zHy^t0ZW_r9jKg-g0`+D40hLOx0cL?P)PqT=`#WPhEJYRP2N;A0Fc?pxj_7C9&VRS#
z+Kq}Z1a-9Tnlx19(Wne`K~0p8O4VdkP0T=kGCQ-e6@G%sMCHd!fOSv{rehek#~PS}
z={O#Bw5w48?7$?w|GQ~up&O`$?xKq4U)0Y6zZ|pk1XN%hQD;67HDNw#!bup4rC1Z^
zqiSX~ss=tm&3_!5;AwpL^S{#LCKb(4JIFvikcE}8I})kW6LlnR)Xo>6cDMl>;{j}n
zH_?T429X79hZ*=h>I3!>D)kpIT<`xy8rsQUs0DqVu)hnU`pKx8NJCBd7$)K}Y=uXW
zx^=1yHlNlU>`H$gDzj&h<99A%2(}zzHqry#DxM)UTsXoy8<qMssKAb)s`(sdqW@46
zP*2p3Cs`{nf&OWXMvq+6uZvNR<MhH#ScuBVmR!!i1&x~wC?ySsnQCr=s@gQvd)nUG
z$6n7vz3*dCJ6eFMi3-#azK05Ym%V-zRXg9Jj_{W4SITpn2SW19M72>VOGYi+8Z~iu
zRPp4XiY(V!Y_HF;F2M+{SD<QWw;ex-+TclicqFJIzv!l+2X3Mk^nTJT5RQ@b<88k)
z)}#Lf>d2<s@iNqX%dr9O#5nvOm7%KnW}yUB23n#v(#`hWeQ0!HARjy922>z_Vomfa
zFd3+WN_9MHXYEj#=wh!AMx}f->bX+X{R>eGzGM3vQAfMqjJur^G?a=ns8nA<?eG@r
z#(Sugc@H=JVAL7A&;uJ|OH4!+)ksu;D^c^TLr>g_3T!8O;VJaj&;PSDwBw(wcThX=
z9$^*=!z%P$sPQ;dpv_SMcCh2UQTOFyV;q5cYyN{eqJvl$zejDrV<Z8wzT;2h;lx;*
zesk1B{ZKa!LM>Q;`m|0&on;y72$o?gZbD`9GS<giSQTrGG9RpH)Oah@(d42#oJJ81
zIT!0;1!{rA=#A%4DZFUMe?m=s50$yfqfKDJs4rq8)P~xk=E+7E=Ar_gfeK*pX!5TI
z)-s>~_M$!%U)%m4sJElq7&B2UDg!N06J?`P`=q`8ENZ?5=!dINfo?`+bQi|ser$xl
zjv@bQ)GRdL_zu=d*pTs+s5AQ%8|wko{gGqMj<Qhq6`&TFk2;D)wtobbi4&-z`wo5a
zM^t8Sx$VGR)C3;mOiFz*hJGZ*VrxvmJgkEY(1n{&DgFZWHe5n~{0Vhre_H=S1@JHW
zq1Sl+N{;Rz8u}zYfsf!=)Q#&=zesFGed7<Jc6J+e1dS({*De!P<<n3Z+KBr0pT%Un
zi`qcrr_8*)P#GA21nhQ((FkIoz*>TV^vkTTVs-j!Z2tpnO8+P-h4(Q4Jtmsxf>D{Q
zi>i%AsJAK$Ra<#j4WGpbz5nGj^gso=a2;yGPf@A<#`f={cIZ3F?6?`~>_?)We;I4x
zQq&P_!#F&E{qP!U;dVtP@E-W^_y7Jh^gtm7;Z%J1I-(E#3RL79tw&L3dj)mhHLFLl
z=|`b9kcz7Q_NXK6hRQ^5ROZIx!=L{pG&JFKQ~)zkXS4)^@xQ1*wxOzj52^;Pq9$@C
zn+2+(QXYUR#zv?NC13*_fST_a)P@&KCjX%{mNTGl_!fKN2C7Q$qZalqF#!glb{2-3
zAQqMSR8);*pf=JCwSiu?KL{02E-IjWRA%OtaQ;fkVg}?^e6<okr%^vF3QNu3;a<c<
z`X5@ap{hJ`s`-+&M4f#Pbm3@B#&T33yD=XR<7iBnW_~MP>ZZ|>fiF;1@AtI%T`dZg
z+KH%0r=mVY&to%Oh1&6XjKmwLFJ;wdOwq+)3;JDA<1?@ZzJ_7A3ALX4kiBpQYcg=d
zUhsa_ED(+=o`$GE60sh(Ko<@|9pTf~moc9HDpd8KLe<oLOhSK~@iv&E_kR!#6~%m1
zir+%*=mfUHYp6`bO*g4dLZ!3=Dg)W5oejlKSd2ONAyS`C*bMVmxVgxwI+t-AKJlE2
znaPjQ&==}YYt-}Rb<0Gha4@=XksaTTD!P*xj%QJU{AR~1zhE-ygUUcXROY&&Qs2+^
z$6zhicZz5z121D5R$xOsi<-FdO!Mgtv3ADhj8DThxEZtX7PiG^FPbAOMtyLmVJgl>
z&Ho{)CVoRV$Kv?TG7*<qS7J2dyRjCYM;*yMYv^n<K@!$xybCJO;i%_IFb)@E75oTY
zcn}rH71Ys2mXUwGCIiYiN1Tl+mNTeGucC@8dX8Br6&Z4RV-x%az0teeWGoPU=%=Fs
zZ;v536no+%)O-g}Mf!C)`B(9H%{321p;D8M8t;ut=?GNB@1S;c33X(@U;zG&nOJR}
zc`h5Z(|pwRrKrrjgVpd89EhjfcA&|8^S{N?Q4h{X72kfWgMVQRM!sae53Mnt{z6p7
z_M!qliGlbt>PYTlNAy`>uJ^>Q^b1hM>wcGpB07X#_$5Z+Ic$Kpt+ih^fn=d}o{vqi
z1RLW@Ou*x)BYA-S==mR$fnd~gF{liuVQanrJ!m||z#JTo4^U_K<U;caosQM%Z$?i%
zfPQ!w75JA}6@Re(U$7DVJGLM5ih1o4QGs^EhByJ^^!~p}Llf*neF2Z6s`@f2rIi<%
zlt!S&8)7VWLKRyfDwUH_sh^KZ@p4q)KchBu4;4VzVw1T{Y|Hx2SQ`4aZ$Jfd0u|v|
zRMAvkVy?$v3jHk9(UhPjUXGf07Y5-K)N^<3c=%HDTzgc2#i-YLCb~mtte{Z?w_+$B
zMNRM>YN3BnJCA+UjCVj4V;+X#3#g-5hRVolbm3-HK&Mda{D?L29!6luYvf-kihs=%
zM;laxy-*M2qOKRA-h!E^K;K49v<s`?X{?9maR@rg%npZQHr=V%ACI7(uk-rD;&Yn4
zPX5Cgn8-jd&cOhD16952Q2~5_+Q~6=;RW=?e^B@NykRmIj><$l>TPI=?Qn#3H73%(
zYOhDQmz(#qlXWg?Cnr%wb{mti)|;dovr&P(hXr^56=0(krs^|LwUm#Ya29sM<Jc4<
z-!e7R4Hc++Bn|Dn7~^p^cEoL{v%GKh`meb!5Yrj2i%R7n?2J!gTil7w@gC~=rYp^_
zUKyyPeFRn9*+}iUoe~;p49rIr#Q{{L=P?HTE6fg)tnE-m+8gWPaGZg2Q1euK+su=R
zZRkIaskjtd;HNkVJy+>F;&z-VH1x%K0d@9sQLo`L^u!9(2WO4Fz719NA6vh{Ncz9q
z>;CVU4_Yl$ZOz95T!osy+G<nWQ5eDcP7)2BX&0=Gk7He&f;y6As53r{v3M4hseiFO
zMyxRb48m;slTk%^5cS+CRKS-}M{pmNS--X9KaNHM4ZUvtF&{_a6g-Z3*m<2Pnzg7v
z51|4$i<<Cv+poOd6kQZ5^?5iHSD-TCY%mK)U`M(c8_0ia8q*ojS?)#^)eoqh-a$QB
zd!u=v8S4INSOwol1+WLT)6ebr_oy2A33W6N?0ERQ=BT5wCF2d=CI5*uav4yHUP3Ln
z3bnvT*bNV&A`aSQb}$fiM5P#jucHEAhgxtSX5)F=Z}Og5xD#eEo{j#v&`m=Ny@iT+
zH8#QBs6eiwGEr%>*<l>&zI4=cJx~kwLmkO@Ou*S#6}O`g?!gQ^f<4i5i@EOZM<a-V
z!RU?Su`-sRQZyAc@mAE1Kf`Feg<UalE8hUj!KSzkJL47Xfr;D9(LRlue+BB(y&6OH
z{_m%u1<znSp0j=L?dGSJFKVJT*a^$AFP_9)Y_P)wG7Edt{{sE6-urxZF$rtn5)8o&
zsLbrchyVTmC=I3TA5`k&cbZyw43)C+sD;;}?)wc@-E}@Ne-#^SU5F~;Bd9aJfqKnS
zcJZI=u^&Ey8?XajM=!nqO+Pe0Oq!#PA`^qLuXQ+TN2RD@orz(%6?OkH^u-IPo&Jmw
z_z%{?@ZDzTX{hU6P)9KY-I`#y9hhQon2vQAUyNFKJJ!Vg*7K<1yloBm$kapw)cqY%
z0rW;M9Bs!ZV0HRWV{M%G5$8`4IO`bD0(;Sg=TH;e$7UG1$DG-tsQda_$D)p87OHl(
zVOzY2s`|Qn&D#=>+Ht1scf~yVL-xAOF9!P<P|CyincsLCqf*ryV{injc*;<Ly@7h~
zw_`LO#QJy{b)V0E^Lo}s9aVkQMq8mW(hHS|0d5+aXap*N$*6_PP-prk`r}&Le;+;Q
zAHczQ2y-#^fZ5@TsOp}NT4)I>GjG`bQPjdGQ0uvWpizg$AE<>xKQ@szMorKbwS$hR
zojrlNZ-VW=h)VTq*aj<5--V0V5aSP;BkYgW=$E68a4E8Jx3if>eFpZS7hW+Joa?9v
z@1s&4@QM8bq9#bkcG$;`FT^DJ6{w7Ui4E`)sz!VdnGK|4Bl_Jjmi3*<G?E#39d$;>
zQ7OEHRq#4S;{V~pKn|PtI1Y98!?6|4#Fn@Z9~LiW&<{OguJ^>|^vf|3_hT~aJHOcr
z^^TegkE3={hH1DHQ}L#??lF_<0hrGCE2tfQhRyIk>Zp=GH5=)O3NRZLz#P<l`_Qd3
zyF;TjHv7y>I1!b)b*M;BqIOp4xcwgp7*9VJb!78!5H3V-{1yH2j=k>nxjB13)b$AT
zL)YizUlYVLpbt?BHo+{cixV&t7h(dQ#w7GOVLm{q=s~|5swjJ+4;G*=jz=vx6$9`&
zd<kF1>KO9{`EO4n<qPw>UNHvJpNd&H2X*~()TcD~r0FMN3jK+wqj?(};#pKpR6b=g
z6oaavY}8xSA1h-ahTwR&Z9I=b3@kzIWDV*F_Mif~f?Du4Ds_#%H1{{d5c-|5Dh@&g
zl8?za594qTYM!6$^*g8|a=T8O9VDV6%tJj`icz=@AH_qcOay;r7U+-K*|VtEcP1*u
zYf;6v6DQ)ISPe&>F-K91+SoG~toOfyMhymbpi=i4YNG2{7w=;|jQ-jz*d8@OSJciX
zpsp`PCUibT1@<{=hhL!ryo}0_&skF=!RV{^zZMPM5chC^4+F-~ABdW;6kFn4tb?DR
zis}lg*lwbJn%zYeW7s(}UnHi|Z;RnL2{m6i>d2O3hTi|pcHjmoRh7Om)f<4G^lPHd
zE*h1YMAQ!3U?^sxsyzo)8~Lc`CZGZ;##k&x1^gzua1DB?adhRY39X}DC8G)pU3mqr
z{DQ)QqJn(a@bME}!x$=_R4{SUmW89H2lyu^B&Q^#q_~n>W;AWS#Wf|QQl<1QX{Bk|
z$=%1hCOtW9`0!zc1+K{j6DJ;6;VLK`HFngvVMXIz6AC7}ii(ShM!7~5j&c<j6^tty
LwPnPi=+OTGdK0ST

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 4549a936..f21f594a 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "non installato"
 msgid "installed"
 msgstr "installato"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistiche"
 
@@ -45,9 +45,9 @@ msgstr "Ricollegato con successo"
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Sconosciuto"
@@ -159,7 +159,7 @@ msgstr "Vuoi veramente eliminare questo dominio?"
 msgid "Do you really want to delete this user?"
 msgstr "Vuoi veramente eliminare questo utente?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Vuoi veramente eliminare questo scaffale?"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CACertificate, il certificato o la posizione della chiave non sono
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
@@ -305,7 +305,7 @@ msgstr "Configurazione del Database aggiornata"
 msgid "Database Configuration"
 msgstr "Configurazione del Database"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
@@ -349,7 +349,7 @@ msgstr "Modifica l'utente %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
@@ -384,7 +384,7 @@ msgstr "Configurazione del server e-mail aggiornata"
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
@@ -482,108 +482,112 @@ msgstr "non configurato"
 msgid "Execution permissions missing"
 msgstr "Mancano i permessi di esecuzione"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonna personale no.%(column)d non esiste nel database di Calibre"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Il formato del libro è stato eliminato con successo"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Errore durante l'apertura del libro selezionato. Il file non esiste o il file non è accessibile"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "modifica i metadati"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s non è un numero valido, proseguo"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Non è consentito caricare file con l'estensione '%(ext)s' su questo server"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Ho aggiunto il formato %(ext)s al libro %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Gli identificatori non tengono conto delle lettere maiuscole o minuscole, sovrascrivo l'identificatore precedente"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Errore nella modifica del libro. Per favore verifica i dettagli nel file di registro (logfile)"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Probabilmente il libro caricato esiste già nella libreria; considera di cambiare prima di sottoporlo nuovamente: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Il file %(filename)s non può essere salvato nella cartella temporanea"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Impossibile spostare il file della copertina %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Mancano o il formato sorgente o quello di destinazione, entrambi necessari alla conversione"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro accodato con successo per essere convertito in %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
@@ -596,174 +600,174 @@ msgstr "La configurazione di Google Drive non è stata completata correttamente.
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain non è stato verificato. Per favore intraprendi il necessario per verificare il dominio nella developer console di Google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s non trovato per il libro: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s non trovato su Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s non trovato: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Invia a Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "E-mail di test da Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "E-mail di test"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Inizia con Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail di registrazione dell'utente: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Converti %(orig)s in %(format)s e spedisci a Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Invia %(format)s a Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s inviato a Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Il file richiesto non può essere letto. I permessi sono corretti?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "L'eliminazione della cartella del libro %(id)s non è riuscita, il percorso ha sottocartelle: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "L'eliminazione del libro %(id)s non è riuscita: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Eliminazione del libro %(id)s unicamente dal database. Il percorso del libro nel database non è valido: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modifica del titolo da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "La modifica del file nella cartella da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "File %(file)s non trovato su Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Non ho trovato la cartella %(path)s del libro su Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "L'e-mail non è scritto in un formato valido"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Errore nello scaricare la copertina"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Errore di formato della copertina"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Errore nel creare la cartella per la copertina"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Il file della copertina non è in un formato immagine valido o non può essere salvato"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg/png/webp/bmp sono supportati per le copertine"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Solamente i file nei formati jpg/jpeg sono supportati per le copertine"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Non ho trovato il file binario di UnRar"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Errore nell'eseguire UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Attendi"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Avviato"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Terminato"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Per favore accedi a calibe-web non da localhost per ottenere un api-endpoint valido per il lettore kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configurazione di Kobo"
 
@@ -772,7 +776,7 @@ msgstr "Configurazione di Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
@@ -838,7 +842,7 @@ msgid "{} Stars"
 msgstr "{} Stelle"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Accesso"
 
@@ -1056,41 +1060,46 @@ msgstr "Modifica uno scaffale"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Lo scaffale %(title)s è stato creato"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Lo scaffale %(title)s è stato modificato"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "C'era un errore"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale pubblico denominato '%(title)s'."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Esiste già uno scaffale privato denominato '%(title)s'."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Il libro é stato eliminato con successo"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Scaffale: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
 
@@ -1171,14 +1180,14 @@ msgstr "Categoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Cerca"
 
@@ -1198,102 +1207,102 @@ msgstr "Elenco dei formati"
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Stato di lettura = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Errore di ricerca nelle colonne personalizzate. Per favore riavvia Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Libro accodato con successo per essere spedito a %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Per favore aggiorna il tuo profilo con un indirizzo e-mail Kindle a cui inviare i libri."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registra"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
@@ -1370,7 +1379,7 @@ msgid "Upload"
 msgstr "Upload"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Download"
@@ -1536,39 +1545,38 @@ msgstr "Dettagli"
 msgid "Current version"
 msgstr "Versione attuale"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Esegui l'aggiornamento"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annulla"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Vuoi veramente arrestare Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -1581,39 +1589,39 @@ msgid "In Library"
 msgstr "Nella libreria"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Ordina secondo la data dei libri, prima i più recenti"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Ordina secondo la data dei libri, prima i più vecchi"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Ordina i titoli in ordine alfabetico"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Ordina i titoli in ordine alfabetico inverso"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Ordina secondo la data di pubblicazione, prima i più recenti"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Ordina secondo la data di pubblicazione, prima i più vecchi"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "riduci"
 
@@ -2452,12 +2460,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Ordina gli autori in ordine alfabetico"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordina gli autori in ordine alfabetico inverso"
 
@@ -2939,30 +2947,26 @@ msgstr "Da:"
 msgid "To:"
 msgstr "A:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Cancella questo scaffale"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Modifica le caratteristiche dello scaffale"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Disponi i libri manualmente"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Disabilita la modifica della disposizione"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Abilita la modifica della disposizione"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Lo scaffale verrà eliminato per tutti gli utenti"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Condividi con tutti"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index e0ea3ef77ac4ddc2c8a45f3da5fe51e014946399..02ec8a14d3f5c8e64430030fd7987d08a6804547 100644
GIT binary patch
delta 35
rcmZpk&DcDfaYLaNuaT~Sp{{|Mf}x3(f$`=#EonwZ%gwX2Un&9sxTp$0

delta 35
rcmZpk&DcDfaYLaNuc5A?k*<-Ef}y3Af!XFdEonwZi_NpNUn&9sxd{qI

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 805e925b..ff4bf4ee 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "インストールされていません"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "統計"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "不明"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
@@ -277,7 +277,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Database Configuration"
 msgstr "機能設定"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
@@ -352,7 +352,7 @@ msgstr "%(nick)s を編集"
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
@@ -387,7 +387,7 @@ msgstr "メールサーバの設定を更新しました"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
@@ -485,108 +485,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
@@ -599,175 +603,175 @@ msgstr "Googleドライブの設定が完了していません。Googleドライ
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "ID: %(book)d の本に %(format)s フォーマットはありません"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Googleドライブ: %(fn)s に %(format)s はありません"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s がありません: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Kindleに送信"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "このメールはCalibre-Web経由で送信されました。"
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web テストメール"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "テストメール"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Webを始める"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "ユーザ: %(name)s 用の登録メール"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s を %(format)s に変換してからKindleに送信"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Kindleに %(format)s を送信"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Kindleに送信"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした。"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "エラー: %(error)s により、ファイルパスを %(src)s から %(dest)s に変更できませんでした。"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ファイル %(file)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "本のパス %(path)s はGoogleドライブ上にありません"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "待機中"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "開始"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "終了"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "不明"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -776,7 +780,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
@@ -842,7 +846,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "ログイン"
 
@@ -1061,41 +1065,46 @@ msgstr "本棚を編集する"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s を作成しました"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s を変更しました"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "エラーが発生しました"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "メタデータを更新しました"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "本棚: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
@@ -1176,14 +1185,14 @@ msgstr "カテゴリ: %(name)s"
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "詳細検索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "検索"
 
@@ -1203,102 +1212,102 @@ msgstr ""
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "登録"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
@@ -1375,7 +1384,7 @@ msgid "Upload"
 msgstr "アップロード"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ダウンロード"
@@ -1542,39 +1551,38 @@ msgstr "詳細"
 msgid "Current version"
 msgstr "現在のバージョン"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "更新を実行"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1587,39 +1595,39 @@ msgid "In Library"
 msgstr "ライブラリ内"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "減らす"
 
@@ -2461,12 +2469,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2951,30 +2959,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "この本棚を削除"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr ""
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 59d510d611b0a5f7af96521f3ae1abd8d591b1fb..5042a945899657064c294ce4540999e717b6be05 100644
GIT binary patch
delta 4088
zcmYM%c~DkW7{~GRDsHKWC~l}gAPCB)h=PVfg18H!5^m#?j=7|{i{pz<q*Izs>WoYN
z5t`U&E`x^QxRgnTORi}ysc2M?q?RR6*7xT<Gcm~Lp7Y-Goaa2}+zXZ-cjX;(xqtBX
z*l75w;$K_-J*cPF|6hBW7~@UzQ>=q0un`tpFWdgR_!9kP*2m~c`)}miH1sm2CHkV`
zbw&E!CWQ+P9EnO`0yf5F*a=r-Ydnl~@e(S>?@<Bop$ArBGklIp(7UM<*AGKzhoR!7
zV`p53vCMCFbKyfrDJtMI)P!E7sdgA@B}u3R(y$F?;sl(FTEJD?e;4^SHT(!bPqHE>
z6NQ8}iKqmIV;$x<Ib3MP@1Q2yfVy!z`r#pLk5}<!`~#Ip%jT37+grm>rH)07PqF=(
zsESO+`Zx!*uqEhL#|K<!MO(1}er9htfm*?JREew67ym^i>`U3S(ooa{y-=0wk4ktF
zD((tYg|=Y~?!pAT?L+;QY1<ag$|F#LUO}yJ0CvSRRKQ$htl5Esu?SVM`YcC#+!B+q
zH+H~W48z^1g?@*s*d5fo6)mYhi!uMup_O^Jaw-skYWF~8o`D)L9(DNUpaL$o{VPzF
z*np~FzHJ}CP}*Oi;#6W!tU?|3Zf@$uB1}4JWz$fPnfg_MTqHNM8u>Om_@M-jp|+$L
zYvCDGh0fdlhqnI-Cei;CRmmRghZ3KGs+@a17hSk`8>6rgwep`a9zAGu$KI$37oq|z
zMIE+W>qguEF>*f5Uep9%+V(|M1%E_64SzXpx2aDZRI)axy$?dIJQ}q%J*<Q6=M$}O
zq7qt)D(!MqLaUM7&4(C>g{XvYqT)S3os}vK((@nC&N&n**pCm=k!qPOsDuup68Zua
z=rro|UqnrO$F|E+3wefdSd0Bo1$&{kY$0mA8x?;Q*46W$$AtoZf+|@d62lbh27G`D
zT!A_(Pf?|8#LGb|YL7bAT`>rIqb8b++KQQ|Gql{g88!X@zIgsma-oUO+7E7`KkbL8
z2|Q`&a0a3R#aYu(fu^DE%eL)xsQdF!3pk95e;jqV&!Z}L#h?1CG<R&rPpAP;P|t4_
zYLESR3&|i<fKb#Sio^u$WBc8x$1oRls5jaEGpIx_TJNLI%F_V1b5V!)ssj3;5(-A`
zeFXBTnx3eD8Q2k5q7vPY+PXs2{ijglFQF#9flB;WROKF98*nn!4sdg!y^2GvED1F*
z6}6HqRKS_2Q#~JR<2uym8&C=4qqg9XZI@WDV{Q7&P>Gl0Vi)IvgVKw(dku9~<|UYl
z*O1SQf3UNM$=I9rXjK1J4961~i<PKx9YUNJ%q$F}ork*b91g)6jKTqAk%`$D!~Et7
z7aVBQfcK>Ah*{VVUmPM-z{8k?_fd%i)2ToMaRlzb@mP&ZF^gaJ1MwQBVPI$Hcf)*C
zoFgyV?EiBvbQt=QF4Zv^Sc8jD3C)XeR<It`E=5(u73n<ZiKq#(F$d3K102F~b#^jQ
z<L03Dd>t;sU6{@MCM22zh1*dBJ8{x9up4TRhM-FM9xBl1sLEWoR@#0KUhrC3AU44%
zI0_eFGdz!qSBgE*PxbfaB9jY>V5Xz?bQ31yx2Oqyx;dqcK?Te~?df&Y;R<2UKJ0`!
zcoQ{lOn2w+hiq&?dmHlFHwSSVUg*yLr*IKZI&7O+jxJ8;9@L8W@*W+Gw@?#=@jjh|
zH*h{C^t1u773~Yy6o0|ySc4od<HfR5F%HM#3RL{Ny{JFQ8qZgpOp~z@?Ww3eo`(v2
z(0UH3wkg9k*gC;UJRhghzJzS6iDxi#o9XC}`N#ucPNU{~gi0vH-N*T5FdKEM-$ftX
zhjsB3X5d-Wo(3d3dl`+FX(!`IY|X~2<g-x|ti_2~jG8F)Ro;^L78YRvo<#SozRtV3
z3mdM(mxzop15sz<eN+XGpaNe(CEAdEQ#%UT9WxbGnU7H8uAuI7^>Zp4Y)!>T`rmML
zn=M?ZWF^SKG&QJ1B1v2AIOI5(nMl>lPSpFM43$`7e<$HAWKm`tj>CJXiu4&kRdGCy
z#c~Y8R9+6PIDcj?7Ye)@L-8yI<DVFa?FKm|PsEk9N8l>FjrDK}C$v7!!Wp;_wS^Cm
zgKny^HFn{Vk%LfMIR(R+-z?yQxy%l1i;s{e&omzD1V}<nyacu4TEqC;9(|G6W+L)!
z_VYt4cJVd}L4Q=GQc;!Mj*IXbD$!x-?7#N<C>PpGGu(MBx}yfXjx5q_w(T-&8&0HF
zFa&v$%sBMLt*AXOwBAB*+O82!;?0o|CLC+y@)6WuH{{ZxftxTKkK%ExKn31C(h2Z2
zY7g(C4<?Lq{!f>II)phGg+-{9S0Km4q+~jYtVL~g9`cbX&7}T2xrl#_mjd2H1)j`k
zm2inQ50zjEs>Hvc4w2_*elubmKPKZwWYMM?190dVC$TxGiFc#=E3A$Cvm6bK#Adhw
zdBV&t)Qy!Gk6s*UZP7qfA}dgp%g3o$G_IhiNh7a<a=%L+jk|<LMTbYl`bWpaM|EBQ
UP0;VIxPqe{ayu2APiyY^A4L+%@Bjb+

delta 4237
zcmYM$4N#R;9>?)>74Ra+RRm$t=t3AP2nZ<(B`RiONn{ELM2x)nGHK2#RF?Lb<)CI*
z61|XnSsAmGHkvTYERC{knsRk3*2$fwYq@Ka4!yYBs=Mrde>`Vq8RT=$;huB;=YRgs
zgPlh_XODWEucJfS3}09HH;#W7hN<`euXlXLMALm2L-8a=VxRR}JN_dMXZ)X5&q!mU
z=tm+$W-P{GI%>Vy?zm&hXlUY6Q~<xj5!iz1xC?)SA7dDvMaB3%YQdi{1j9!eGa92%
z0Vbo?&B9d7N3B<j6R`zzjbqGV8nF!gj9So3c-qj9>gS_QawjT)C76KAaS1+(+UT4e
z{}K5%5k!-OiAaoQCbETDfC``vL)qUvNkb=o2DQ;1)CYU;TKo_b@f;>&NQ@guDn`)H
zwC1ByeG6)SnH^t_%19%6@e$O)wxOeeP8vE<7lz|U_5&wTCpeEv@o>^K7JaCI(@`hQ
zLv1i0mAML3z-v+K?nGtik2o3M!UDV)Oa2w<#4+y43s4Icqf%XoH{cS~f^EoLa{!C+
z6I90HIgai)73W|Hj>k4k!^5b9{tcC}e$>8K<H$dUGb7^NlO>}vP+<E-sL1P46IP>&
z?-A63TkZHxR3`SI=D%tCy*PpX7pQdx@J0+LO)B;|4h;@rYEdU!hkDF*pfb>g1Z#F7
z-{t^66u=48mGt2dJcG*6*LM6rc6<o=FJwFvmB}Jh;OkMDb2ih+q46|M!sDnr{ukzB
z44tW1g4(bdwZL{%v9(!WwBv6eb!v{FHu$sc2T>XP2kL1U#_{PpCZ2{;mWI0f$*7ah
zLS0Rfwc7rEjnzQ~v>lb&r%(ayLSi?s;B|N$74Q$J^)8`mCHxv=QuO?1(@;^A;asdm
zvS;?A0y>5Y=oD(9)2QkXqBicg{VS-0c)5o>j7DW}KI+PvQS*18)_)Ge^!&e0Lkk{4
zrR+Gemg&<6@Dgg_tEgHD<)xrhjzgU&6Lo;un1Us!jT%u`u>n;>Pg(b&GSiEW7CJ{m
z6MjVnVEpa|KIGdZ@k1LGqKdQ}wcsl2X4E>rM}4l__K%@H--kNL1=RY#po)A*68TpO
zy}V_VqS2`SSk#2;QO|J(>aG`B7o!%aMio;X7GR?t??F9|hfu}+sU80>D$r0~qcSep
zaf@aG11g?8)PnO+0ac=EpcZ*_&1%$wTkyAd7!~Mus4M&d_4&)F`C;T)8%3cG;74U{
zymh)`8>Of#ScN*-eW;1+Q736ZEw~$1-TQDT9z*^9V^jcVP*?E1?GIQZDU6|vC!hjP
z#C0C-e=d!i80aO>ihKZzFyeZ*m=@vSiwS2izQd0H2{Y(l!dy&Fb>~%}UNoJUhJC2d
zdD!)K%tF0q9>&Fb{<~>RX28pPk^(o=t#@H1{fBU{h)@e&z(S0pL+qv!S;#n8il?y#
zGt<c)w%~0TF_AyLSdMdW9~SEQ@3#XvgsB>M0Lhx!f>-esRA4V>x+ge}>W|5CGcpDB
zyf>jX=*Erc;h5pL2~|7WQS)9z)xa@)nElOPX*`5g*}Nq1FQ|z%RGKEPKwZ%$Bo=cN
zwa`UWW+KVAOh%1QLuIHOeb|oWxF1L35Ynyn#-KBe#zGp=xE)D`=|J7-r>Im7o#HM$
z50%R0s09z8?lh7QtGKGL8*6YQ`lh<`o<yEJ(~V>B6!K@loS#bmSI`I{id*nr<oe7T
z=%G5lL7n(4`7Oqgyic{k-B^cFH<ET-gM$lVJpB-kHwv%87|cS-%-oDcxC*QB;7#OT
z8^la^Ph5zKbR9<G3pfK`MlF2a>M3yF0}1#9<He}J&)_l)V-mM&?nPoU9q7k1$OB>i
zjU>sWI5XXds!)Fv_Mocz2*%>K7>1W|5t>=<otC2RvH?HGby$YQTzn$#L2d8>*5Vb^
z$*X7cA5q+kZ=>^f8XwT;yxDy>FXh5jd`-w4<DhEdeN+beQ44#yF9kXS)vrfA1ur0V
zX}(0w^UifYHwBaES6bI24~k;~Zo`~FrECBxRFg%x3ZxFzUxk!|*^Ok+e1&>HB+PRI
zYeEIwf}F{m!n-l{RyQM!xQ%`*R%0TSoTlf0Jq?}gCDg+2;RH1E`2z%LcpWZ4rMwB7
zaVu`YQB>wIY)3D4;!5m7U12<r2nBC4QCGawx)FWsZ`x^O;C^Ipa~j8CN{RbsoP}E8
zKGepqq5{sn!+mN>kiE<^$hY~9ACKb{-bSj0UQESrP#N>y>1MPJod+0rmWCo8xzJ7F
z2GpIthYIXhyaC5kfgIXYp!$2QU!jkFRH^%7Nkl!4Rj3-d-?|H<>Gz@z@I@*4XKizl
zfuT67%>BR|)WpT805;%J>_RPkPr185GwLq?fU!7$=@_%vEykHRiT;DAlXoFyW5O!j
zeM&0GzwW%20p^-c+>2Lm6Yge~7EY;hQ<!h9MFqGGmEvwp!xPB2xy+AxEWOKpY~Myz
zzmI71FdMb+Jry+ci!SSDsEPeJ8W&N*JaJ|@>T|DRKAyx}jHqz~DMY1q87{*IYkKzk
zB1b0r?_aTUrN6epU*E8@p|PRfzjXB){}P6p);6qJ+w<DBr$a_$XJqGO<mC9X^YSO<
zwzj4G;+fX7b^PY^*33JG&u$F{4g~{`1p`k90|$eF9l?&r2iuPgHkt<qJA;AE!N8lr
uKx?pL=iq1f*&gh8G#Ge3*zrW`YxCj~HVyu&U30a9+hy^CNv|(Rj`|-oB?)N&

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 196ea2a9..007d51de 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "មិនបានតម្លើង"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
@@ -47,9 +47,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "មិនដឹង"
@@ -162,7 +162,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
@@ -283,7 +283,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -313,7 +313,7 @@ msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្
 msgid "Database Configuration"
 msgstr "ការកំណត់មុខងារ"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -357,7 +357,7 @@ msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -392,7 +392,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
@@ -490,108 +490,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -604,174 +608,174 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "ផ្ញើទៅ Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "ផ្ញើទៅ Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "ប្តូរចំណងជើងពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -780,7 +784,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
@@ -846,7 +850,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
 
@@ -1065,41 +1069,45 @@ msgstr "កែប្រែធ្នើ"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
@@ -1180,14 +1188,14 @@ msgstr "ប្រភេទ៖ %(name)s"
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "ស្វែងរក"
 
@@ -1207,102 +1215,102 @@ msgstr ""
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
@@ -1379,7 +1387,7 @@ msgid "Upload"
 msgstr "អាប់ឡូដ"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "ទាញយក"
@@ -1546,39 +1554,38 @@ msgstr ""
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "រកមើលបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "ធ្វើបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "កំពុងធ្វើបច្ចុប្បន្នភាព សូមកុំបើកទំព័រជាថ្មី"
 
@@ -1591,39 +1598,39 @@ msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
@@ -2465,12 +2472,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2955,30 +2962,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "លុបធ្នើនេះ"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "ធ្នើនេះនឹងបាត់បង់ជាអចិន្ត្រៃយ៍សម្រាប់គ្រប់គ្នា!"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "តើធ្នើនេះគួរជាសាធារណៈទេ?"
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
new file mode 100644
index 0000000000000000000000000000000000000000..5ae70553ce8817c722fbf0a2466ed8885a18f353
GIT binary patch
literal 56464
zcmc(o3z%J1dG~iwxnC3z1VneZ&H%Y_6Qc;ZLV#Q(3Dg^UGINrQnVcEVnMsJ+lE6S?
z5+pzZ10*q#Kmr6ELV!eqN<XcawhC=U+ge-eJ?G40ZELGl>-YP=?^^rpGjo!F`aPeI
z<ahSkYp?6O-u13`t-a?v$G&=9!vB7JP?Ee6zV}33)&IACRFWuY0~`yVf~UhD!Smn|
zqy4!{;IUlK3D*l?%Jr>~|0fUg&sp%LaQz#2DAyy$@C>{dUI$mhx5DqiOW>(w`Wkp0
zybQh<9s<|HSHUe%<=Y0&hM$Lr!ym(=;eWs*;X&so$?@<QsCZ{Ug<k^|?_J?~0aSjy
zQ0aUm@HVJ;cfw=fCaC-epyKa@D#vHwvG8x8;{5<Bou5OsZ*oDBoCZ#XN5RXX;!lUK
zhXr^FTmn_TyWz=j6I8rsAxR})gNMOCy3oUqfNIY-L6!4tcs#rqw!^ET+I0ZF9qxtG
z;Mo@?$t>6luZCZNH^A3lOxwU7crJV%j(~$u<v->vNpb=_AD#!NLY03pJPEFb2g8Tq
z5%6*NTDTjk|Go-Ognt9oK6~M-;m_f5@PESf(FlRs<2b1H7!6bScBp*b2lf0CsD8Z}
zs=SXvL@0R)s(gn~`El?<NEMPUsD67G>iO+(Bzy+8!XH4@=NKNk9-awLgnt50hU>!h
z06dB7FT+#ezrvGY@-~lu3e@!lQ2jC;o&w(o&xA{%+UXNe@g9b1=jUMy{2n|59!aNN
z0ms7E!KF~~Rzc<eI8^z*1Pkz=!}a(}J^gn<joS}E)wd5SzdNAh>QP9Qljor1_P?Rh
zKja<WZ>{inuE#;ep8-{lxo|w}fokWcq1yF(Q2q52D7pMED0%-aMD&uQ7|fD~36LS0
z%z}!4D^xyrLB-z+Rqv;u<mfkWB0TJJ@9$|)^4JUC2>YSR_Y|ZFk}pH0`x*+V_CFS?
z+#{gUy8x=bmqC(FW<ce82V{sP8=&OzMX2~cfRfXnLCODrLAC!;6O!c3@NB4dy#lI!
zbK#p{1)c`)f+OHlQ2qW*sC2&*xEHEC{{>afgQ=|K;0^FvI37-gYoXfdJ5c%k2UI#o
zPxA7e40ZixsQRA^HSR8f(i@jUJ%1Hc|GXbceip#<;4-Lj@Ho`C`X*Go-$J#=p_3^S
zd?QplTm)6$YoPk!eNg54FjRi)pwj;YR6jfeDRS}`;rj3?p3X^7?KlRi-DX0SqYJ9t
z?t`y}&qAgDd8l^!N2u})!qefw2#xyX9H??lf~UYaQ2qNMsCwK4HO}u2d<3ezpM#R4
zuRx8LZ$q`?kD&7VPpI?{zS7f4q4K#9s@#*I%GVB6-<zP)`8Yfn-UpS=CaCi4fO`J(
zQ2p{ERC#|0B@YKp_4~&{mE&}%a*l!O=W$TaPl3ws`oMW1ycfQP@Y|sJVKuxEZh`8*
zzlRLX<lh2EU*+W}!Se~f1**PJL$%8bQ04y~RDM5)D(9=O_VOJMPvv?9JRDvIRnM!S
zp8I2{cK9GX8-56mg!e&>yDve>!LMKoJmng<A0`DZgi8OezyYXs{~DYD2ci1)(rG@=
z&4McDW~lrIpz8fCI1>I8B8thW(_JsOLABGz;E`}MRJlI|&w-zZt*{CYg|8=5$>p1%
z>U%m=x}%`_^Sx00^C37E-VDdVo$w;~Q+NbCbEfyxSa=lIZ-FZ3WT<iVUa0af4dI*N
znOyIJXTk5l*TUDl)607TRQ@ec@^mSj1>Xgg&f`$&e<R$lLCNi*C>!x~$P|>k1FBvh
zhU&Llp~|}&s^0y98=&HS5*`L0hsyUEcnthosPcUe>iPeKk~<aZb>K3H2qy1@O6P$P
z{xDR3?t(|dufgNsKS9am&!EbC#B7&~v!MEI5>!9FGhBDTGq_$1kA)9FOoZf9@DTVT
zsCNG;RQ|t#D)*stydG}|ybvn?nGg|8+TrzZ0IK|lUg!OFE!6W}Q2ObnaNQrSx54uX
ze;zWGB>xE|hZmEW%KcF&y|)&Qg-^rF;g6y8T<afudrpH&{|0y>TmlvU4tP0y9!gFR
zdY8BJ5m5C%6{?@cK-GI(2)`0aU%UsZe+#e`&V%aDHBkMv9jcu^3ndp{ftU`-3s7=%
z^t-(su7YpidOlQs%isxcC44>H3@?GtK=tpxLFNBjI2yj@J)X}+Q2AUAB|ld{wa+Z5
zdiO$=>vpLA{{&Qe+o95X79J0uhbO_8p!CSULG}O9@AdRgfah|3D!c$rg=&XCfhzya
zQ1Ms8gWy`Ia^4Fi-(P}ngx`Xy-_PMW@QC-hU3xK0xt<T1>XQ|49Q;ctJ$CR7p5K{J
z^*RTt9uuJQdnc3}&kom1q2%GCQ0Z-gqu}@8+u*V9cl%*FRDCwXsqh<6{rBb%`1<P{
zD7jt^RgZO0a`P}u;im&%fNJ-jL6z&cg3Iw~a6H#@pvrSE90Q*XtU>9;Q|Ed;uZFt*
zAUp;3!zpklRD1jiz6D;~=Iv2}Do+JUUOx&ozE%d_AMQU2)jm%`)#qDK@=$~7zh6R?
z`&I3J|5zxwISZ=ZmxSx7Q1Rabl}-_=y_Q1d+Xt2IS}3{P3?*ON0-p=_|0eLCp~gWC
zN`78b^yiO)ujcw>X#D{t-{(NZzZfdN8BpoJAD#?*!u1{Sbgs8Rwa=GB_=`~SehANk
ze>BhaehWN<>zPpb^g`8tIXoEN9j@<(S8}}_UIBj&RgO#N`}mm#RsZ==?b8Dffh(ZO
zxd!U~Ls0F#18Uqo4;B9(;lc2y;rhRz`t|Sy9{vWX^1T@<opa%#@Diwa<DuGXM!0@A
zRDUgiuYzUxR=5~So(A9{unG@_{{hwRzlJK;A9c8%I0Y*G5m5CV9e5d3J!Zhe;0;ja
zUl78(pvw8DP|vRl;rBts+Xl~ppN7)={{YoLM}5%O2QBb0uCInF&m5@yy5OnsPodIT
z4;Al0sQey>(x;z+>c<zM+W&j-0{9E4c06yP_xmMK^?x6fo|+fJZ-MHUZBTk=PvGA{
zrCWn)zyF15w}U%9{0OM@PK9c(v!KdzF_iwB233zXsC3FOg?&)vd<ZJv&p^fh8dUz@
zhtdnb4%cs3<l|usR60|k@_7$bI%TN#{IhWXlThjHgh#-yLY4C+sCN8kcoF;|RDZm&
z<m;aqQ1bFo*b1Ks{4N~L^$}gpx50C`UI<&@J@7R6xe)%Z@LaBs>h^Tr3RAAzpyKyI
zmE&=!e%cwXe+-Z2`ls+U@PFaq@YNsk_CE&d`b4PbPlLz6RyYE_6`l#-14qK;@Xhek
zFoj=-uY>;vHBJsHySyF@)vw0~o&=Tuo1oh740shB178b20^b2wL&f_`cr1Joj)C8Y
zs@Ll)-cM7Z#^VRz`S5<I_WNu2Cin|D7M|GS<(~?bZWmO2d!fp^466Knf%ibwe_P-#
zsQP{xs+>O#;lG3`*I~Whj^m)(c>>h)?}Td40+bvrfEstVK*`}|cqDudN-uvED*pFi
z3im>#cf?}P|757^aZvS~3RUkOsQ%vy_52G^<M5mCDEOc7Y<SQT=6HAxRK7Psjlb3K
z1h^I|{$o(>u^XNU{}M_+d=IMJgMo+L=>2;pRJ?NnCj`D5s=Q^Wak3n${Z~S@!y2gk
zKNapj4J9w1gUbI4Q2q20JQjWzsvQ3bHIDuls@yG0J)O&-(!T<#y{AF-?*cdqc0#q&
z1Mn>P1*mkZQ1$*_csxAv!!B1Npu*n+C9fS&`S(JV^CqbJ^+CnE8>;;`L&?cDsCc`f
z>hald{S~NkeGRHSe*@J%zk+I)SAWFY^E9aIaq!%OSm#2?Vc(y)U9<&`<obtj3OxQ#
zUEjP1s$MJLneYLq_Ie&(1*`B9c=1hc-*rLdzXLL4l4s!!aP%@Cj~@^GYp8l2x!nE0
zCqvcuroh|aDO}$URjx;%+TojlKMwpQR68Gjv&VZg)b%u|{+tW-+)}9aUKzL+9>?`Y
zsC;)om1lRj{t{IDufdbyx1i+cKcJp_%`G1PB&c$p4M)I<Q27<1;xC3O&k87gyCK~F
z3RL`mfNy}mhO^=8`@B3KgeuR6pvrMmxc(T___!C|20sno0x!PR=Y<lS!Sy5X8u-h=
zDMX&b_1$n5{0Y=JzVy#rKNO+l<2I=Dw?LI=4^;hLx5C?DBs`ewE1}9a1FF973*jZG
z`u2wVD?@lcl-z$JTt5cYt~;Qf|7&<5{0>xqANMhr^YQRZuCIYDunfn*2jF!0SMUmW
z%1W2pHux&8ABBg*Pr>uxZm4vA2vxo#S25SY5m5Qx8hB6ORw((|1=Sv3hwAqq1^x=^
zxnoxQI7;EUTwe|^f}K$9^hqc=cm$pWpM{sfe}(73({9J-0jEKwzZG5ppM}c*r|`}2
z;E!Wt!L#64_z+b3--ILKci@rm$UD4UPl9^>Lij#-HB|bKz!W|guD=7-9{(PA$QrNj
z8)1d;3!&s|8&rP(0*`_}f``GMhwI-$_1{r<`uz!T9M?19;cyjv9lR%S8=S!PXTtSw
zU<cR7+~xhd6prQkQ7F0mHdHzP2VSpucY8kb1AF1ogx?ab?+V-m-%a?Z!u4TmeSDk<
zC4ckb5%6ZH`g|Oo1pDDz;SQ*NszJ%miR(PyOQEi>hLXz<L5-99q1x$bsCqvKUkkqs
z)oy<eUk85#_1rHZDmOXp9%LJCg1Ud)y{;e5gnIr8sPg?WRJwEFA#f2?y1h{O-U3yx
zmErm!DE+b>o(;bURiDAYH}t#QOoS&AJ`+mb7C@!50v-n+glE8K;OX$&Q1X`C=lydO
zRQsO`=fH7L<z54o?q(>t-wjocUqX%B5%+s~9Z==J9limsg?jFBsCNA#RC|9n+&|<2
zzn{W45q=3&Ij@Ju!-av%pwd|fRi4M;N$|7b`dd)#_Y-(B{BNlE$F6st1C{OssC=#q
z;k_aJcBp>Y3|0Qepz_}VmF}0Ip8p0^x<7$R=Z`k{{S>NPqXI7r;WGnofJ(13++QAe
zSKxzC`R;^jpJ!nSeitg=nHzl^x5E!{{Vn)<c-1Fde|`X}y*~|AjxR%#({TNxaQ%zG
zgEx73j)$suD^&aopz<3JRh~KUa`@iB4N&9#JMa`ZVzb}B6uyJ&KMi~iN<M!LB`0Tp
z()Ga%xPa?r(E1C`;`+a#`t#}s-9K4`Z{+$hI30c&&VVOw@%-jP#oq>%&YwfI?+fs4
z@CWcRIN~9%M**sy3!v&(hAQuEa0L8f;E&)at`B<{T@EjS*D4;Ae))TN2>bz5zJpNt
z{tBx7U%S=wZH2n-fRe|X;TdoPRR8=rlz#YIsONtG)t>(Y{|uh6&Fi@lDxH6ZnwNe7
z&xdC`;_Z1oyoT!)Q04muJQ#i#s(e3&hr$1XuY$>=e*e`_<v0S4hHnhl*FZh@KB(sw
z!as(+Q04m?d@tM!4~JJg=JBtEy8i*FbUz9upSMGm|3RpB-UG+N??A<S?RFneBcSxo
zTcP4z3Dr*@gxAAAg(}ZWP|y7fJOcg<s{MWgmH)AiyWSfGb$>d%622Su!Uy3bc+#hQ
zUcCV--(Dzr>x1f-%~107B-HbN4ONa4KJD^Zf^X(}Cp-)O9h?q-1>Xm+8u0mi8$6cl
zm!RtP6R3QScmi36E%4p22ddw`4%MzN!Pmm?hVXxfvIBkz)vmAI;qlK390@NZ{6eVm
zbU>AV4OBZm3YGq6;Y|2NsQgcO(%XM7RJlG3)z0^Z@XhdOu6IL~^UF}}efmz1cL{tu
z*At-1dlNhot_j=#-^BH!P<rz#(CQVg|2^D4{3$PAD?FZfW1z}E8EPEAA07ff0acH!
z@GbCDa0dKg2*3DgPybS=a!iM+&wJn$ScEFac6cHDLf|jqd$}I<jB^z{mFpivwb#MB
zyd2lV)40ADz8Zc8rtou6`TYyjI2(j#!=J%};7PkZzc)hF=bhpDPB@<Hzkn5Z=x1F2
zd=z$a{TP%yyy02b3#UWn{}?<9ehn($Z^QH8PoU)TggrhVUks1q`rYvDumn|~$Kbi}
z*CD*+IoB&iIEL_ksQX`mv*FL7^w(9Nb$!qURgN#iQ(zUUJr4Pt_s@|~{d^oe6`lcA
zjtTHkcpV%G-w#!f+XEkf>aRxvpM<aD`nkZb!(+JqE>!wIgNlF9=RN%+p{~=wbD+|{
z5K3+)K*`tCz#E|CyApUaJb~*wq2h0Ydj8Yl`Z=in_ySb;*Wt<VpWsRG7w|-Q?DMYo
z&VefDL^ux4hD!GisCwN4mESga2K*dUdwm~{fCv4#KYs>PeiuPKKQUZi1?O}9$FL24
zK7^m~e>|P@q3SymrmzUrKDR-YcMa6IdNhRZ2;qC6`s*dA{PseX^JjsFe!;`v3>EJz
zsQcrf%K6T~_d~VUBB=V_2$laz_$s&-UJm==6!`a0<w?Kja?%2o|5(@pFA3KLsC*U#
zE)ML2%I_|yaj^mF`9}kvfJbn>3##A00M$Q#8}5G}j^w%u)n6z5h0FJBsQkO3%6}hx
z6MPV={(lb7fG>snzk<sDHDB`dkA;$p)1ms~ZBXT(3CF@4pvtudUIy30gW<QK#^Lwi
zIq;Y-dwS!b<mBqW4tOlre+Kp3{ehd|8@S#EmEZGF{qS`tx&3b7uc69!;#WNV(XfT<
z%b~`12UNLl4fpSd>hH&(p8N9<{tr;?QH6^C+Yo;ISAAYO6P`x+HBjZ~f{MQ!s+{Yf
z%Kxdrr{Gmw?}3xxA%E%eat&1Y?eLB8TQG$`hiAeQ{>uGZZ-;8%d4c_bUxnur{_Ai(
z`ma4+0jk`0L)B{=RCzuRr@$}4BjM3s^Y%Oi>V9ju9s>{K`W+$s%D@@n{&nyy?zcmg
za}~S*J^{~$KM41a`nvbSg;3*UGE}=wh03opuoC!TXzd7lxxWq`1&?^a_4P?m&y`^c
zmqNAY{csxmXQ=Xwe9`TKSy1;s0WXE$hbs4Jf8*^o6~3A4k3yxp9xA^F;UVw|_*%Fd
zrtqs!<*!1u@6mtj^UUc`?KK;!{5L?!e;FPPcfi-f=L5e9mCqm?0e=;E>fgD)<}&y?
z!h4~{<DWtG*LHXg+zpR|--l}NU%=yG`VHC^UIcG|H^Bw)J5c4j;w6v&PN;e<g_6IO
z@Fw_;5I*Od9)BKGe%(;<AAn=vc6coOC#Z7$8&v+kfzl_(e#@U93oqdMZSW%41=ao!
zLG{yLK|TNPQ04nARQiYgz4yns!0~}s!q;<u20R=Vq4Mp9YR_BYNO*S$e;z8`m!RbD
zU!dyq{cwHEKe!wm2NgaAN?&{ks=oKbli*|UMEFHG2mTX00bcNruJ5jb%I7*LIr;!p
z|I82kNC>|Js+{+P>n%|EJQl9^K$Y|Vz_-FL!9(F6ecR>laH#s73onN6g2|aJbGy10
zwpP+gvDBXSbfs5!l-fIsgwN|LFDmqK$A6@yt{#5&5{rOTPo*90<I<2o`+lG3Dy8im
zm4*2@_2jsDMOWAS&SE;L+_AW*B<Gb{D@`NkZk7s*imjEiD`|JRYhH&HnO}=L+KXih
zJ!5=t&w_MfXGgKrlXAk~%$9xKoK<Wq7kh|MDV95m6{=snkpwy_R^vjtxX{_ro|bwS
z%`KMCODhXIy1P3{^OLjBZ0RhN=7&-Yjjmh0h55y#WoBowP${OxQl+<COnb?sk}fDL
zCW*ArS?Nl9yF0rI?P<AV{(_!LEAe~hc6PM2CgammaS3<Z3q3`pURYe{=q$|bERIsG
z+7_lXThD@GI=8o{ho5tcon1@Rf8hy!>24=aS9;RL<l50y8ubTAH6*2u2tVnn@pMAR
zVwJSApx8MtUD840D}OalN>lZ8^mMAXsB^hkXkVHZZ|tb_R8*jDtMDs-aBdeHmE+sm
zij_)wP1k&h0BkGtP|?^O*QxK$OG6(_F7*`4>BO#bx!Bf|&MfpS(DR5i>9n`&zjS;j
z%~)(7J*imgD7L4w3-hVm@bI?YN>A6Kw5_YNcTq_a(p&U+le!iaI!gA))OJL#V_rwG
zY?ssN%{lbGU0m0})wT3YxuZ?xwZKAS-V;5KiJk{FiFue@#FXggLb+`L<Hpk9(t3c4
zMOF^}joIpFw`9`p(fnm=D=rroN^R73R#8bMw1NKXTH^nv6Bi)NlGmAqN@Yn`nU>Ps
zbW*XiNRLlI6Hs{%>RM8gILGVB?H#nO-O^7>#JhVIa<W*BW;d@bN|uW0%yQR_OH&P9
zwVn56h%(2<NqnHFTvIipT2yIJ{vk~jLcL2WY0LEsI(mwo)SJN-?s@-)3(p~)f*`rd
zQ)b-@3UiApN@uKSDeWySEK$+4ST3UpyV}}%k*M}jQOtVEOVh%9#K1;h85u8im6k5*
z>LtDSE1gj8T7s^bpN#k3qfx_;m=D@wX;*K`aOvz^no4_IMjQ_`U81{73aGbs?}&*A
z``mJI<n_h5XvNCXQd^4hD9n}mK`y9MTQM!9^Ljfw{jQBtQYoibcg^iW9t-HsePu!l
zZ4!iH8uCe%TY<WEhCz4WCl#}^SV_C)G2L`B2<bFw#Fk3yfgg6wV%3^klm?~kH4{nA
zyz<l<o+{TzqD^;ykTko{M}MI5E$*mv%<bsx=vj(5WJ=@rDXOJN0c{$Ola(j<3feLV
zUe5yNC+nX5^r8x0DEI6qMrA>7PdnpEQOYK1DqSUAR4Dao3?$=w(rcJZd(s&tRQ;s!
zGflIl(=kk@m|?<@n-nCT$UTL&1&cKO&+7Ov@jDht7u8iuvBB!FJ6-4!A|O<=y2>88
ztE`#MXZdiGVQi7G5i|u;_iKD4D7>p3o!HisOenN1<ey4M8)~UEuVa31(6$q3hs3nk
znJv-QU_6}JVpV1?wR@9_JxurEVv1Q}>8xIx>@<Ft2IbrCvG;vvw&q=rw4hMIN+_1n
zLVG*oF3uFHUM1Aevd-d_i;KDz6LVgfsm{80SX|j9VM6bwb2YGSV95xu$oi2_yqigv
z424!Vu-v2^Vgq`KEBOk4sJGaw!q7QwT_vUqn@y;N8=&v!hMBATe^gekW+8iSp_#f&
z*qx!-y}i|+p^vB@8h5`{%+<~eJI2(38+o|ssOb@P=KOSCN11=;l5d<53Np=6bM3{&
z9q4fBK$>E%rYULkxta^x3Z=ACm{&wLc+^K``zUJ-6mA*Ku19=wMb16HT=+G?VvTK(
zyLByg0yEXHN0^_B^SjDRhu<+{%zLCsdS>w<P)$m~WPlBxB{;uOV(hkSph*B_FnB4t
zi)G9aY#G0-FkFdN$W7Pi3%_TxoQ(s_Ql>syXHl^{pXd_oaf!{u#U##ZQGukBI%FoQ
zdhyoekxEhHS>i_tW)*wXGL<YwaV`-?2KhuXd%C)it@_d_i#QLVqXbqqGb1!w><6M4
z^3z0~PA#D}>26uHy(LmMRZ_&L?e>KQK`6Q&*$QQbHb$OXcJy&R9W3N=X+ua%%ME5<
zHncaya3gCX8nv@)e#0GGR1`;Q=qS8%F4`__H`_Ow-ZYVn-+Dpkb;-_3D?P>TipHNs
zSeiXmO6U6`5FuwRqYkEo6=qR#D4m^IIago?_qa(*cw12gC}}ZCBlr@;W`;st(aXN3
z5)xI(R{iHN{T*&CRcC~8J&~UN-If++He=F8qd8pLxRRor<w}ypk!N*wGI2qXW|W4T
zW6M4Qy1FplWRYe|n;1B&Sf&Nj*-N`=AdgotV@jzduY8G!n6bF5uM|B6X`MD^0nDr}
z3_TXAi<p^YRw_VuHOk43awZeI7BStq8L10RzO;A4^k-Mn)LNyv1YyM1-47<lA-v#=
zvr$T-#8|XPWOFNkGWF0+^yz#?nCWv@I9y3z4)JHiCp18_$8}*9DD;fW0$nS__!#UX
zCzs~4Y*--sw~Ul&1+ST3Q>$eqS)<dIEKomHd~HvG%;OQ$>FLUHkmga$oCl<wE|Mzm
z!N6u+PowHSc`#;B+*H$lNH=u#cH)hYyt6D-1+4PJrssORdBvW#1<@_gQSwHzF_9(3
z@a`x{=ohh=Mypyr>hvjYc}xzCPS8j%TBCEMV-XKoq0eKgL11DT(X}j;nR$|ltYcU#
zPOVgW5fr~D_!!78OX>KTQ`4)9Xk3dhTI;)HqE=T}abzwZ2G_Rs4vW3%U8Bxy@pX7B
z^MsenoC})fX~H&N6=h4I_&kG(o=hf9$VOIt`hZRYo(UOUUuH?Eag$8C>bf~m^d}X{
z3zKXfK>~8-Ulttaj?gph^#|HAX?OFZO@k|Uf9QNMDw$NASLp4;Iu3Jq7La8^ucy%i
zQORy!7uOZ&MbkU`h=MT2q@}qgNa{#L%l`lii@(jy;kU!+s*H>G%w9It=OOAP8-`fJ
z?F?O?7#n5Lk{T9KR;d(`t#7+ZolDR2gv`XG<Fk7jEQ^r>b5^?L*_d}2Woo10MPZ_q
z%_^(7(mU6qR#d($CG!+D`W}M&D04kb=wyO)*F)a3#P6jPrP5aJ=r%V{?zdXZ*8pya
zNc1OlR7^?drxFF4hR%MZE!Uy|X&vjQ)?`vw-jQG)18FCB8c2oP>VJ0E!Xitr14Ksd
zeVTtcF}1W;JogD@KhnC>t{yhTR;k~ZRGix@*Hha<nR_uYbZC&mkU9bCJC-<0=^N#Y
z5{t1VJHap7JtQF_l?%2WVBQML&Ka_nlgT5eVcuZlm1T6tOA?l14C9}n`tt3u5u_oD
zDaE14YPb?Fl><q}u^NLz7Pk5_@eM5>?}w69f(@GKk;x{*l#E1Wq~=Y{2G3PuF{8Db
z#guGEOVs>#`X`MZvqm{@xMj{X3u(6QwHu+AvsHT9s2nX$7$8kD$`2ij8rpMM1FFE&
zf}N6BO!unWe4|B#g_#zT%Mn|%N0y<5&Y9Y*P^QxSKJ88mm2kl$VOdc4SqSde$t4@8
zIZ2Np!##lEPQ#!MVKy?g+)F~hw8DH$tZO<-3z=*dbupu2*yHF8w?j3rEzYmIcf+md
zKb>4^D=&3zGuiy%JS#DApN2a=@*z~r-R5-*+5?6Pv&Hh=qqOP0IEBO%t*{s_<rqLe
zS~plqNK?q!eHfmpuj9-+;{oazvv~coEn1y^>AK4An+;=@Oq$mV6J^~d9$pMSYK@@!
z0?Vv&OeC{>G)ds%VHi_t^ZyoaY%8|)nm1xj>Dod}3-h*O{&bsI8#W9oS=zxVmgcly
zNEM+hNo|>7H_8nq6ae$IrZY2eWNHN^fu)Q>>5w5}h0+-AY%d_#Sj!SqaU7m9TOr^?
z?CC9+P?=1V6rr1SR#6kXt(<63Ympl<cjfL4)~)#<%$qd%#<tGh_F_8u#vXRHn3qUD
z1m(Iogv36LmthqjA8?&<qctEcMu8V~P!ZBh?FVj$hHQ}360Z1}a?k08UCr$%6-;ub
z&@EU>4y_5Ip^0fU+;NzTHw__R*h>v#7Zzzfb#|-G^RW%<skXWKYIZ@i1Jah6S=kW~
z*#xblayjImkqr5iT~D)kBik`7;|o2h*7ZYtoVkR8IZrRqd-HJX%MQAtqvy)rx%vE>
zN3#`nJ{n>zAuvD0@I)H!4tv%tdta)=_EOTp8(?}VEzpEo;i4_WD)&5>GUP(7En%iL
z5jAAj77v=bE!g&0k|``3v~k)vQB1Kljdz$ez?^HZNn5U(Ir)loWIEMWBhlB>UN;bI
zS!l}<)j8USt>mE<QZ`{UNPrckxsS3jp6}yI`sxDYRnD!4SR69y5X_$9qHY$5Wsgng
z`$$q-aiNXUII_d$6wk1jikbN0n<zAv2CL<XSh23w?5z~)Zr-@XpN}O4;qlQ9xu+X1
z*y6zvYPW~vZ;nbfVYC278-?Oq)Jm?t6uDgN#`vYy?Y-r?9Y#$2R14HxogLlwkM~<L
z#oR=S84V)y!A>t0<+Yx|(2>d~a<_B<*Z9V4OKYL_uxzd*a6WPsJujCLOUD+hq*O?0
z2iJn>W?PaJ-85rSZKl~PenQGv-OUKF%t|=8wB|_X%j6sN!3x@Ko+QJDnx9U{FUF^6
z82hxD==Zqfiejl)M%S7C30KVbW)f(!PLX+n+1}8;3T<O4=VuZh(CG|ma8D*T@o1M)
zrvuoZ93F36`jJ0Lu5e@3oiOQj=Fe+$$4!01VMwfc?aps_B1Bu<QSjoNpK#=Zre>=+
zTl6=Egku@`lOb`Mq}SvYQ4-my5k^8!Z?}zBYyf<tw8(j>Dv9K_qhW$`P&y#HXh^`e
zY-5@SZZpq27th<wypz)r1UcmKS~3EB9&JzDbLqi0bWHHd@^Ci4wOH;CyTyL4jyA|C
z!~%@EF->azre|@w+V(Vlf7LC^mG(%koIQJHYIA>bWl;xAk}Esd{3-cro!`ae$}YTx
zSK>wcu>8oK{Ok!UtL#_WGOddVDH=^oY)SoWgF7H|*VpNwLM}oj|J#PLbpFHw7RM|p
zJ^BU3KLahc1ZRrI<_sKM^#u9+fJS<KzmEhhL_6O$7^Y(ekE2zr&%-Lvv_BhI+J$H2
z6-rB4#^ca$_eXpqWmGb?ge`5m*!;u;+9{_zl5UQssU<{5t4tqRW_pezo{#JCesCjR
zvU+T1lG1sQEXuWEua-22+_Bl;^#Kbtv}aHDP@^IW{*&ykNlVPrY{RtDU2HQ?dlt#$
z=ISEbEFJTf?st8MuWfEuq0G?_9GE>=v6X}%(^IebC=CzV;gE(UKw>?FChzSIKXoj@
zd<}_No4K<nXway#o88MSeSfaezi(j^$IDw!TcD-nct`8C%)l|kNh+H>nDF9>uzW-*
zQ+gmAH)-{}8`3&2&BrGd>iWvvhF-=$SPAj_Xt?y+G@6>qX_+)V6hF7hvuv*@ccC4p
z6?KTMl1}L;cD8#x{f3^-U(cBPLHzB+GaqR#g@zmHl{m%blu$rz%;Yq<{Im-=LRZ;m
zS~ww#sC)+2l`<Z*k$>8mmD4n@%XY~Pd&@Km<L}p(UTwD<@>Lohp5k-!jRvnllNbl6
zbCV||eJ{Vt!7#p3D%Uy{ahp0b^BGyQggCYe$_Fqx%wXN9pv$}hW-B#x+P=aM)S1Im
zvSIb|Di;0HaeY|#BF7LJq$Q*fb2J9=t2nPmvU07>T|raJ-szF-w-F)SC@tit`9uos
zqvw=lS6H-OD_-<E1tn}TNtMkbSw@)3X3j`OkP7>g93Nzg)B!DwjBD8RVwjB@HHx2_
zf(^D8rTJE6R&9I*&K8-w30nMmlvYquJD7uvjq*~4XE-fovvqtrdyEY14A+w4-2FXE
zhOts{L!q89H)(<b&TOrVmvUo1%U?EC?H5%uBdzX9Qn0D~#x+(9%?gZkY3gQz-~XA)
z_@JgCYd|@u2qfouwm?5mjtG+{bp@K^dL0*an|ORUkm>Pzw7bbq9rbkh&TqZ&toNk9
zF<>w#w0$wj&PXJ=7!8iHX@ySuV-cB_iySFoc{7dOnsj`{HgB>Em!V{u4hs0c7?|P2
zn)#Ut4EvzhOZ}zt-j#}->C{Q}I}PVo;s*OPZS>7unoLKCIkc%F$62q*MyQ$KaZ#eU
z?Q^s9cCrOK+#1R3dW4L{ky|M8PmunNJ@yZ|P?hN#FdU7T-o^i^a)oUpPTwJ;tdK@D
zoM5D{@y(?ReOez?kI(#}*a|RNa2qL(T6__Ui>3NaA2jt)JE9QXP_oY$T;~O|HS9_B
zYTS|f{-XNfq!7idA|5EyMKUaN3#<CMX{8u80di-l-^C%yc)lkX<wH+RlUy(jNn(@+
zyGxwu7G`1Aw@cFrei#RvS|)7Em`mecjfb?xNAp`VQf=XRZkOmChF2I8dHt05(1`2d
zWX9FWjJdcVOQ^8nr`j=cWzAsA&sdnuknQUo={E0qQc*l9-K9f-Y<$nq@e=Isa9o2O
zcr*kDWl)Z}#RUr)p471!p2noM#Y?oK&C2><_x#Zx>@K44Sm*lIWu>=U#ybyTDVWi#
zd*p~w7Nd{uF3lf}zUv-67oW(1pY7_dj9}@I8;oHqp5f42%607&Ew^8e%XEe%IU8wb
zc}_v)C@|M<c3Mn_{50$}OW_}2lF~eD=O0GN?=afT+@cl%ET}Q*=ecpOhQ`-(BOY5^
z%gh6|{AA<4h2IKl9hc0UG{tleGCxyZN?a;_s696qxR;Nu0~`FE3uGK1A@f=N`&ch@
zcf6mYZQWfRtco<@s8p<pZ0icctiZ92;8(Mup184w_{Bp`Q3-L!PkCE18j93eXss~5
zw5l{?jNIc4H1t?h79lP{@N3vIiunaGqZ|poQfc9M&Lv!G<itau8fIil{7kpmJ~*Pu
z-sX~|;YfcWH7kg%9DDtP1OEu!dFiC-*4{SL1RE%4U^Yu(7CGvKU7UqpMjXo`wplEe
zBtS<#b)<uJ?lhL+rpakO+3aj{>x`dlijYJ7frbMx?u{B2yS>Y1;&O2wJ>oA~*unmg
zSbh>v&zY4$hgtWr4i2aILu^J|XUYVN8tfz|RtA+3u~<Q0TA9!^8k}xD#Mfe2!sp%^
zqNA;vVS|&}b#?c4Vu`R6<((Dt9Z`3=x=ei#Qb4Js+QM&_Qi(nWUJQAqkNP1+J%?Lx
zW*N!Xf&2I)wb>5=u`0y5nCtlr4Ro&i0PI>jv;5#agt%K8ECti|zMhp6Icc`p7Q$xf
zY?ntcC#MDLmv%nGli6h|e_uVaMPZ4Y3n|Rg;LQbuqn}v_BT6kylKJDxSr`@a+Zth3
zg8Vd;g!7$_^zD~Q$<bFO4pxPG={uSQj-ShpNsKW;FCc{rQ<EVD4geL{;q$~Zx@TGX
zGBMAI^aD5Rc6<JJs?15Ir&pTSBB5BLfqreV4S|>Y%g!~&lo(MuGnQ$o%uXhLxK+2$
zNOYbKCz`5Wf;S+obhH=eQgHKFX)|sVakQ(7_KH8u-i)du3pDFGKQV{+YEncz_;;kE
zH8ykW9#XKuGWo`CMygy;rh=!=FJax%alU*}12m0S-x?({krvrvKb=Mo#osf#<Zt63
ziA-X3ogqx7gez@R7B)&~W0{cJlc<#2v?qZM;i4U@Syyh%yFRe_QgyK()=RE+?2w#B
zyzK-1F6n6dK-E{7R6w)Z6%dqDJkfEjCMOkfc2_sibfE@j<Oh96m^|gWr}680D4elY
zAf~XLf*Qw#_D7YLxknq{PP)=2d0U$kkqL?!+w}!26jnNfag-(?&79~`E4GeRvRc?C
z*LES&L^R}s!g}}G-cmZd1ILWbA94t&N&U*RvKv|b{7UL?)~svvpWIZ|lbvzR*@AtH
z+lAv1>_71~iKI{`92Hq}AC+mfC)=2(f44_R&%S0>GHdquYiHXJvP)(uPgy=TTg;~U
z!$gtH!p7mg{#CQsyAjz{a9L;9Va1ePU*FNr0%ukm);|Z3%Sm{B&5`N!a5)>7`M40p
zt-BHNDy(q0lua2B54^-T0UJ*pvhLB_c>cu8i7InOcE~;+v2F0?sp-~`r)4)-Q`YzJ
z)Oz8~-Nq@|BW8Dp%+TDmjdO<<ukn}Of{hm_0-LVmH0g0P+ADgT(M|}mGh~xC1Wu0I
z^qQGd?K-Af6G--!;Cg0G)TvKIpi{Ev3E3nbewTgN=1!8c%+pC^GkIpkBlz)0+U#^D
zH*tSvW0B=6=1zsin1(|l^^B5P9PbV0&17n`R4cMsn#ieWkMtN8aNNro7GBoz)^?BY
zTi%RSw4{aT$Ppg)CH7D5_!}qk6)XYrA2xX*y0|6m#>9fVgY+f<Lq5ijW)f}Z)15`m
zHf;RahAG}6<U_QI^8<$V7NtLe=1iHW8<Wl6LYZrGw524!8U0wX5u*vkLgjYX`yfNZ
zO_9*uczCsAtx=Xe(-~ZYL&LkHJu~!18AXEqm@ACiD#KEyN3`e58;0f&^dc&7v<D1J
z*zAaW!WA1FL*r%1`P*vAtPX8ACY(v4=2|>UisUFmqV2U*1|OzLd{2ifj(PWlb7K2_
zDx4W9G`u3c|BSSz^udZPhzYvi^vgc|hZl(IW_k7~b-*20j&Dq<&2?;o{kjsaJ=C}@
zW0c9hV`{5*KQTi;Yd(KjDG!U^B>f5op_RFz^sE}~-DDk4V86`^-8^dOczZoBL^Of7
zbN~65jQqu_VNqCpm|3u|sI<t-F5<r84lkqWD2?lVWt&CVZ~1yTQ9+Fa9cobT;YT*x
z)yJ?|4cO4CBjY$bs5Q&pAW1-}U3-c+RAjE0&1L@vYeoT5m3241ezI7b)zf9)R$#>0
zsg_wi4A(_kn|AlIoX@tl+ui4;H2e+0%yH=l+cX*4k~R20W@*n+C&a_%FiqrI2t_AZ
zM?Je0tHoVnv9tS9^iA&Dd}!mO{$zBw%v#DSVNsf^pDZEfanlO!ez6IEc7ab~=$}er
zMv*TK^1svETaT6etBcy%=FPIYZ^RBMT3XgUOq!Up30)9B0pSyc0>W~Z%9~<tcw0mI
zaa203uoQRSl5!WLGIu2JGNnhC@~<Y!oTscw5W~#8JsR28TGAf2Ff{+!@HFU?@NOn$
z%(X}U8QgHTcPZDmRs!15CvUDyHwF2ON553`Ldh409Ho(u!IT_|#@-spJ^9KW32V6Q
zO<78gBaX8zx%qmOr=Iy=C}Z?9_Y^p4@3$F4zF)0@)Tu2jD@pOjZmOoSJa!D@tJKR2
zcO=MSK#m%J(MV>It@+i$VM(iL)z*RjZz?61%;wdj*|=`8v8VHL()@zWzP1N%uQhmP
zw4>et$jj&uYhZSnH*aV|twi{of?n|A4W43mfeBcLLWZ53o>P*YK-<`ce0wsdL{?1x
zq@gYd^^nNrmUB7ZJrDRHz(5;P=!tl#!@lSmuGMk@8vOO0y(zZg)bv(;(~r%bY`4tE
zgr;vFsN9ns;iG3x>BIi@m!WIVIsU$$BY%{-(TSdf2w}4*URsY?Up0^J3+-_+`tVWf
z#|n{_>{wyQXkIvFm+1-fETmlv*|Csml((eq5jrA^n|T?{+O{!lCbyp?r!*FxJA`Rl
zJ=)QrFZ|{dGy39HI~Fymm%Hq+axSMOg${Fu`csI9jb<XwMZ)8^Vl*0%ruf+j<^voS
zcxmj_M7PU1ZG{Sm$0TK>U@?25R7}ezzd(dov<K@SHKvuBt*sTD9YeE7`6FVNS%|rs
zwF49cTVqbo*(QzsLi76!*d$hVFXSHGM=F9IF301t^00(6O~b-_P23Rt5Wg2Hz8j1o
zJSW54j@82zXNy-G`3x2Gd{4R8X8L)2kEobj=d-$K=gJa$2~Yp{J|B8Y>v;<f!@_P(
zY<SJhf>^PTo1T=*C4A}zRc)G>bb_{|BkkDKb$S~OC8e>Jy>C`Yu17fNy~LOM*W09|
zikp8417&9P@4Smu*1KMw{mpBMW**n0FUjq04L`K3blI?R?>3rzh<RU*o<WahKJd6{
zt6|2%5|yWM!7{gFLT7Jz1a4TiotXuhPuuJ(RqwCZho~xkR&;75osJTUt;(2SETvip
zj_>Y{zI6Un7Un)%I|b>}L?^yzYVAQK^*u}Lc@>!P5?)qHbXkwVB-)G3=Qa;|A?@<_
zLn^#`pY*VK71Ffbc&52zY1YaIXtt01iF7tH#}5<MV6gc&Ec_fFGdOp3aMzAV=vBlh
z_k>HdvjE<}tA7GRPI{eE8acInWDweMX_TpvY$zUnZBdSfk<%*kJK9H1=$&5~$yAsw
z=;`UMj2k_AK8FrCGtVS4`h!>rZ699PJ6heNPw43BnKNdOoQU$*Y&migQ{1@p{4wXB
zKXT02kz+1S$6h#Y%mwF;89QbS5l7<lLwJYByC@y=)^QhJbnck967QNqrDx=9)~^-L
z-RgCW>diZ=Tl=f4msK~fuWjg0C(oQS;fgs^CrutTee&$|?Q`us-CN#rxgQ~>pzk0J
z|E}0LHu$oOk+U(AhbJd-;CNVjaa0LkXw&3oB8r91ky6tf)Gu}0W#!Tf-p1Djbm!8R
z(wSq&Tzcu)^sKW|{Twsm(y?RH%hE9^(Yb!drRT?6Z@=_H{j?{>ydAscqaXE0h%=^@
zXU6i(`K^afn>uZBy~D<i8gn>8t|O2m^)CB3^TChC>Dy6yo4s+3BlptYo_QlLsmD_r
z&f{HVPPui-b{LmlGPk4Wa6d7Pc`<SVukcUc!%dy(`J>)S4oN%%U)#`^4&J=2diNIE
zJgq*tlRntHYappTaVy@h+P!O1x?^zNdQ1prl0^j^-RWTey4tD@da^d~S;LC{w07@p
zwGFFfn`*9VZTS4%J|9^5RCU#g>Z&cHC{IkD1Y4>P?P=A#BNMH9_xkFFJ+%!xtGiZH
zo?74f=GhMUL|&Fm(=vw0QU$8e+CFMOxUP?4Fv&K4GH-DCPS3w~&#u9hyW|sm8L?{X
z)(-aXA|}I?5ga~jQ`@ktrMhx$Yg${sY4HASYS-F|$7&nb>>XH^*4Fh^SKSvHB;EVO
z&T8L^>iXreh1h72Z^(;$cC(c3*;Tt|=dhHLmfFqRYxh4wE;QfX9joc8Td6MXn(lpi
zHD##YK~HX6LBVQUm!*UEt*dR=HMp+7w(9ZPs`a)0EqsJ;?~_mM9a!I*)NWa!v3dVa
zOXT(ex`j5eJU6bWW!-6Y+1Q^}ck~Uer0<Y1TJhn>mFm6Q)7n$(YpXWtZf#RvZT%jJ
zo(dJy%V$0+39)PIR@64F3lF8akL@*2pt@;G^%06mqwb?1eY<M+uO)dT>)}5Bm7!rC
z0W1evAf>_rBcZnOA>CKZPZN-@>3$x!COhEced}u*X^~Cq7<)-=-R2s_TDc{qN%lUo
zD;-?Dy0&2t;?h^!-EYm@zr8xJw))UcbyaQM%6yxLTa<jqbL!xScyQyb)lCmIw&&g_
zY4&wV?di27$R7(?fpCo8`@}%?X*&NF%eLvgOpH`osps0gJ87i5(hwUlsy?#Tn#_|%
zNmR*e<C+*Fmx9Nj&L|twWAGsY%}SJerfIH7WSWZ;a$ZM!?Noo6&WI_aJ7{bvwUE``
zoy)2ZZ>NMwlV9oJ$NNcwh7Na;{^fKJ&AY62%g2)HquZ)?t_clTU9&Bz?(VA&EUWHV
z!N^CIE~6V#Z(dWUwVNNOqA>)m$1qYiF%Cnl!H@5%ZM`#I`It++&=e+ruXgX_)qzI_
z?|H~|*9HbE;<>B#@P_zweURsh5ZXItXI)=i)6d9{otgMOBu0T*m$nSvN6%`kr)sd3
zTlm!);#SvC0h60tKrVY1VV?sMM6P;sKb3E(ty_(BS9d(wiVj?l=%bicpdN0s()4es
zK4b!4Wfb1BVep>3b|Hn@mOE{7q7_y3Ri?xS*X^u5xF^$F8rx4*AH6j|vzw+ifqqwq
zg<mA_1hE){Ti2NWTeWF$-6JU8y}MUm=EwBi;;Y@qphIQt*h$meM`ARKhS}bMb?VyM
zsx5=}e2lg;p<drdc{2M8OI2egdn^swu5X~aW0S;eB{klIC`(9ez^>oR4O6LBjM``V
zX?k>KkO&)rrt<Zii(Av@`Zf*HfEr)fJfOk*dpv5@R2_4*x#Pat#yh3y_gRuOsWmA|
zv@lSw^}D7I{y>TO9QTJxY+#w@#J(pG1L>^&CVPPT4&KQuxIPX)?5&s4CA6U?BGY3B
z5Em33CG|dODi@!;wff*{CDQcnihepbPOT~&qhr(dWVqA@n~X#lmZ>BeEs21cTOboT
zD{P~+m{|)+ZO1m7e1fJ}zTL);HE^=`DXx|^Sb=0BO~-&;Ce`hT1@tS~p>8Q<v9flv
zffF9xxQ1FXeAh_JSMQP$oSa7P)hC(f`?i?vv1z%f@9gV@dcOX3LK(_FFQ|nyhZ7JD
zUUk(I=<(X7<*_MkeADSQly9yDFfy!wFE=*TU0;3l5#=W9L{pk4QN8<#>gEk-H#I^0
zj$yc$MK&Wkl%#3IVCiIuH>N6AL1^9m80oZw8zK}$=Vn?fj21WThuGx9+F{5i3|nZt
zR=P&IW$?a!L@lRaS)bSy69UFgSWXOW_A^`Z-!`<FBQAB)TK|gLy64pV&AP?<la{7Y
z^Nn3^AU#)a^PJp;F5O2PM(J!6%O`GSC1&|(btQ|JNu=M5_Bb&F!?wC@52Eh9E~TqE
zO;MlRl+qj$Va*D0lG4n$P9t5jnk~3|oM4}21IH(XdcfcvAFFLzlaH}`=isfY$wBi_
zE?%%v(I*e}=fZ1GuOD2!1`Uu8L*ZdRJiH<w=GrWmV6?lct9Gkqwq)2sK{eF)qjk+}
z2uz4L!c0-wd}ouohKY?WTj6+vp-(UzHpKO0^~pQcGHbHN8N6kUEWGHC;{?Uv9XqSH
zugyZj0bZ9!iC>U(bOvf5i`M+}hc9ConE4}#N7bn+u_UrER@;b;=gPvJhHoQkp@80G
z5J;lKLV=}MHqO$_++`?8x~kiEq1KR}obi-TnWC^9;frm#^A}!MYuen}ZTKK+c!n+v
zgDD@3Sh-E9`NI|wdy?97>#GA#Ai`l)p^SWOy01!AS8dbUMi#}|0oLr%gTO*gR;1P;
z&-K@CTT2Wnz+B3#PqS5TSQgSMu}INuGQ%_s!%dPzjON?2MontZY^&Y2+FvL08A{f{
z;C(U|uoDN@4Sxm;H8-XbYfE3F$U<wlmAlAKZZ;FDHvcbHicJ<YrkgfCB$M6R&{jDO
z=X>%C`OvIML*bYcWsxR4Z`LfXkp6X9U~FuYgokD9dgT8Pjt3cNTbG%I)Zo3i=T5o5
zBxaAS9lT{(W)f-9&T1~Hu6hiWfB>(pei{XavP5&}>XCkyO$jrYR)#@UxZp`rSmc}5
ziX%YMAi2G5^YD4;-hsV4ST~!RNa9ByRnod2t#Q6&TG*GH&kc5UthuG=ixA>q3JT%l
zu%)C;_ddCYNkg`m6iuyvdEV``TB@*iKZSc>4dJH46jx3NwTdS?_&_~TLTD0OMcPba
zZP8#V$~l2;sk-Sq2lCjNI#wT$Y@^-jvSveR^G=rg`8h9}i_IXS2<9%xk4$%AW_D9v
zvAKPxMyA@eO}lFS_-%$N0aug^e_IT?s;+-T(j_XGhq3!&V5mGcW8FDuW`;C)u2ymr
zt_V$H-9XbeRV`Xn;vBhU0}3b`x9%X(3B$pgw`4ah&S+T?bkSfxPMht))0Si=Jbj+I
zeS(vt{-sIUyM<<H)wxCO7&KYls<-kAb5v5@y0P~37P_!+ux~(Lp8SLQxoUUI3<^F@
zlLz-LOq$>yr;Gy=A-!`m>b}X^Cd{JE?!3I&uj!LEcx`mAdTelG^!PT7Y6D#QK1}zc
z5~^g26SLNm2Je?dGboW5%gqs-t$UxrmWaA_ctpit`H%?-Gf#Nh7pP%biX6x@;c6oM
zjOmfG-wUcdTxF(hydOSk$;7L<!yjroPBN8RjlL0|v#VQi5}~I;LUlvRa!hdwotHLw
zR+A}Dxs7HzD~zzrIPzids}!rE=U_^HHFh<nB>~qu)_Rtq>?Ou#_0eY={ZpP%&`$J7
zc+hgrIgiz^Axn3^N(Tm~YT_YvBc-LfYi$)_se9k*&jjyV4A^Ehz!t&qVV2#33k=oW
zw@Yj6ut;_1VWO)|jCA)^GTmp^O2W*ucL(czLrZl#s`O4(#XGOny<&Dk#`Ja89;=4B
ztu%|(Z8&u9exo+Z=su(7y{8FB26&l3=Yh?vk6zUVW7YL?<Nby&X*S-<r*FN&QX;<f
zm#MmZq-?#BpD{4iQL-i?tLolf?1TIT+gls^F|H*{+8fCmR!Qzaw!XPZ)@~hRJ;->H
zME$;o{)l|4cuz55hh`IPl`Nbexml{-y<vN<e;Z@%7K@bM)7n?M$b5b8M}FDh3)XB=
zcLtj!q16ys<AP;3ixKIzgXLr^qlR&qoHjIKPT9oull#>hJlDRfG3-Xz8wuf2N9K*W
z;G~a&r#H*|YrG96UyK!pYc}SG-)PJ-YyQytp<Ci(ZjH(!=x0u~?SiD)9zufb*q+mE
zw__N@m>gDXTFPud#)$QR_|ebdcYJv%HH6`p-5$2N6_-W`hWzyGB52u7Il_`@h<>Vv
z+e?RbLZTjafDeL(mT*^1J_}?oY{JyDwar`BY>DrmQ4U$V$epRnA%V8VmgHA!X^c@H
zt~Rh@xLe|Bu0I=YyB|14&fF+jK=h%+fFLC?Q?t?IJ-670mb^Z3Q^JS)>Wh>3ST>|%
zKv-%7TQ#r2H0uUa)|M+;*~#^Vre`~6(>fXGwv}`r{;UvDdP_^2p&L6I)qUph;247T
ztTzxZzZ0rthb`6ZE2B2F@A+6Xs_Rlp5zOOzFZ+Rg=%r<d*efYh&QGBPRCV8RVnUS8
zj=SWn<$Zafn%}$q<<~hpg<1>im1vbnLCB@P>CU~+>}h7>C*CWvBk~_NjiK&=w~4}9
zV8fl&RZm4PSrh^9ihf&x#f)oIEAtga;ja$dK~c2+W6D`W{6rmr@7V^%`r3WFk|?;F
z{HiXeAt2}-zlu^DBWvp{80%?uMPGHpbM*}BpEk7@p~y?N3>)DZLY$I#czfcWu|z$4
zplt|S?5OLS*ltO~YK#>pFIl!$%;Y1hJMP=ZW8*Rl9W%jgx?pbFqx;FRCGJnr|8|6i
zucU@DxEUGNXkqGlSrvSGt(3+-D(D|KbbA_OEF29n4S`EMx4L!1Wr%GXz6bcbKW-mp
zHM`ozwfQ%j_e9+JiShK1_j2PbA3G^qBQyS@$DwH#vtwX8xG~{<e38{nEX&naZ21wm
z0hek28g~eW7POA`P3+K<wpLsDP_&--Jf&=y(7En<h@WVc9DjNjrBx~o+Ev|%SvYBe
z6(rOvII3HdIOl8UDRWC~!8Qr~)Ua<x3R-tHYp(`(OK$83$6fYFwyiHSt>LEcXP_a&
z4$sCusmbcvwbe}@8@x?h2Kfp!^H+rA>RN^KID9F@PUFO5Q@*6s!69=dgsD5<Gj+Wc
z)3eiR)Y{Ubq1{iB9e`6p<`fy`WeW+&9n-%~N;V!*i#7K<jaSjVowbw-=P6NUNlaG3
zxE{P`*xpRe9;W|uQ%Oij6WLR15aQ-Fui4ga!hR;lNhA!Jc%`|pZ0J)Cb7x6zLK!83
z$avk!fscmMQaN9mA9*mN9M2}wCtEvzE~4Q$j17*BE17(1w{Am0lh$Qv68FveaTH=`
z=mgp@qexaw*s{`w^adtE3}%LljvDPrb>8E)`d}p7&vJQ<vz@t^Lr%2aMIZE@x?=DS
ze1+R=wU;^I{G_RUthV0t``o?McPltWuj9@M6BJG@*4-QSR0o*E-BoLbt4_h|W3|!y
zma{NWaN4t{(`^i!vJBs=^%UyO!D-p1r(mQo!X8HWj%}=Ia3*~ue#uswC7h^>w{54|
zKdp3r2&5Hbzxcbt{z&2%f1r=ohOM<GJIOiutKHY9(+d08&T8_kDbk!ngE<4CHfzT%
zxNPO16{U6=W25=8)7UE3Xs@i*n<S9?7Oo^yGKw!I*vHM3p?&2xjEBsH$;4)Zw)v=U
zcw{ke8Q7pZ&;zmz8O60d%aBwnm7R$QW+J-`TJ&&4?2&=c8%;A${nNTZ%B#2CMJ<!s
zifwy$Y^!ah*xHHZ$~LAk>sD~p&;Bx_W0#apwlzB}K+0Nc$m-UQOBnN0BU4Z-W?y#3
z(A0D;fTM}^tNJg~rdR;Ct=6U|m6gf!)b{Gr+G&@)pi`BcNmYgMplkOd=3z2*`=`)W
zwYAx~+{SY*jgznq_u9ZN?aI@2gX<n27yMtrsiX$iF++UNTbC<LhYIiBl-h&dT$<^s
zH*e!0tA=7uflaM{t5<q@H~nY_Y7@88)m-(4_5MU1ZS2QgX}Pl;zqLOfu;Dp!#CF-q
zDWiHcJBDKqG~Q@1l(n-uc<Y+lu1)md5Z#<R3=>ivdiW*F%x&R(?(RXLTM)xsxWt<;
z^Kzh{FZu>A5dAcCa~$s*BU>jd*&D7sy^iZd+aB4>{s%l(D^K48tF`|(bb0T-QlCq0
zsjb=a-T|FF!ZI3MKHz)C*`9ow-*+8)&ozK8x=fMe_nZB9!<Tx)Dx_uTDRx(HG6%yi
zY!jU8KFv4(<Zu0vVEU>hb2~Oeed?Jd#^mRRmJf6?*@sfLrS0pV->K*fIE*t5V03N$
zE5Lp#UydEi3a@MR!QH`w%6_G)uMX5-(hc`Kg~sSOE--Y$u2n-q`8#HzqEdI;u?p8K
z(mi{3_6_zAKQh1XETY+HD_f~+`#`Xds=98{%qIOX%$T$S=7j$DX;nK@qK2wVVM8<Q
z^FC_Pj@Wr??K9f%)@J)lPAx7I8e8diYdK#9vSq7d`8xmX5)qewe2LgiQ18DO8&i^<
zeygnqsT}cB#BNR4p<a)Xv&4sqR=uV7{@&8H@3elOW^%7j!W^G%724*cR!s4fTiC6<
zZ%^&f=jde9JF={Hah<u#36)=Z@V2KgGue6CV4JdAmk%z-y|aN6daFkZVT#uB<d)@l
zku)m@6Izp($&fABlkBx;3mbY8)8c3y%S!@!!{>fXon@hL)w>^LF2smmQT@brSv6Xj
zY`If!%*N^t^Ja(rdu)AsTLbqL4l`FkO#JZ_nr~?^2+1#e*is)hW+~t3=X@o}ggtk?
zrRQnI=Eyc6yhyzEtrxrVelv3nT6y(7VLrO0&mz~q6|D807YyyM81}Apn93SToSzAP
z|94axlde89fL;qNq=IBc3UfYxFToa7zC5w>DWP|n-?Gu={<ZwWZZd|{Sm8c!OT6nB
z^@iZH%C^^zzY{~NwsN<Mk-M!g$7O$fEN4C4zqYpHahG27v&(C60<B_mHYd(aZu_~!
zBzG|0w!Cy$G1>R$mfa_mZG+pyFiiII8*W3)vG_q|1^_1w5>-2IkXU-r#-r(2LH9L1
zqr`K3oH=J8G`0R-wsGJti6nR?>hI>r>bti;n!a{8h5?(nqaX8U0CBJ~=g#Vl&_V+3
zqcbpWwAoq-hxHw{3aI<^n?H{h2-c1bkGOcktTRJ(AIsF=?V-9^=+cc!2{T$+{oI<|
z%2YRUk?qw!?O4POcg&$7r<FKO!iz9?=5XQvKS&%Wv~88JfaGA2?2}v<B>7F>p*KgF
z;?%o#4Q~o+MPn-+HL$yka_gaNfoT%Ss!1!9RrtZFxcsJAEi3x@5OqCX{=fqYc;ou&
z?OWsuK=M`a-1C~-IC*RzrEZ*6f}Y7%jvH3H3ni?U*`is&JT&aBQi`*8$0I4PF=*qn
zcF(h#ZumZRkV~#qh;UFfI;!OsVkODp4VJDsKaZ;;^}nsuX(hFksVbZK@+<mGb>@yc
z$1hKZb&)Lu?CfI<&?rZ;A6V1mp~lZu`^xI&rO>F?;;K~wE0=n6KST7wQNMlcmc@Cw
z>GQHuY!}Z?|A$%K+Q|GoG_5uzWx4RdAim=_c<b%K?DGxvdZ+B`GuN?zRO8;A)?2IW
zq`3y7xtUwy>dAKKTXQZ|efXNusMDeg^|k7H4~BQJ>q;m8d23T$_dKf=zQ6NI7uTM}
zj*2F$jV>uh&SpOOWDu&H&0zJfH(P#7v$_?R*?LY{ApMq4<3<5C81n<~w!|Y&4Nl*r
zKK0hm&fulkoqJ6ZgD+SU(Pr7l(fayof9RnO`XsD!8+3}92KV4%vJFrxyt&1-8gOea
zuR8}YFSWV*7=9KR^uZbE>lNPQ-Ssg>?0M!RUb)M@q;2M1W?KZ~yunqZ^oPEDn=J`;
z_aRuB)<rmmMXoO&@^Q_q%r~LcZ1}_B{Sf;GYV?)cX+YJ}&kRX}WHTL>ZG5F9PVQl4
zqYRoqkWIo?hFkP%xE9{Kw`qcsonGC#BDUo4B8QGwe}s3nvpKacIA}8SmNsi3O6=Y;
zU$$Ezp1_D(oqq{*MB<+Tm8BwI5TBS(@7J>$T3cCX@p}L^eKu~!)LTrty8a5UG{Y9A
zICE%*Q*sngE_No@CO7@V+|&<w#t<}5W7eQat_Y~QToF+5+a%MrQnGT&Q?YTIzWy;E
zrB!in6Q7PN7kyx}PV#x*DsBd8{jK4o;ap6-@{<e+6ZqZ%T-AG;{c7<Y4qUJ?Rtrm7
zdc8G%T$^vS*oV4v*Zw^sJ>sth)qmwzi}|~u0AX^LGn%&${ney^As^`WdqY0Z?SU<7
z=3AEY;<CNkq)VjFF42*u_4&GqKJ$&J^bN@+ytabLPH)m-C=9w=j_vT%jQhr`#t(JV
zV8hm#e&QN4ha(<o+=oO`?TBo)GUjNsgiYs8d}S-OX}>Tt^va;AS|pjngadl5Uy~1`
z3azrj^cwrp^{Ff*RUN><*olnV+iPa$yAha%ki6L<QHl{WrRM=D&FC5?--mwOM(0Ll
zg1O4ww2ouQsK}(@RFVy{@a{tvBQsMpR1qp{XZdPvB;BLx`hnxVO}t5hdAFXkG70;|
z;d|Qd<I>tTdU`W8LL_~`kzM8dTZKFjRo0LL4`Js{Rf|UkW9jp0dd6XH{R89?%I&+n
zjq_UlR4KctT3uGRZljg-2^0D|PN#Jhn%BH(ZRZNa*N?V^7lb)(Nz-yVD))tzD(|d5
zz*iA$^)ya9Hok$7@L?bOk|)}RKL~K3Pk-0^l_=jXtbg1h1lw+rJV2q@YUUnF2Jc^O
zD$$)q{&kQT7JWuunluKp1k}+l&K?i+9pLNW`PT5L{%z&(h47rC)FrNk2U2|w-0cX-
zRB+yKgSjT<<pJNI_78<K0btY<ITJk-+*g=P<442&I18g@nYP08?o5*x=ECeI<%Gk`
zbQFuHP0Q18<(qPt&A7Q%*wGZ;aSrze?|3}kkh!~jdv)^`6bb#mOz%N9fQ1(yk@KBC
znnDpqXj8@4(IJExN+UBItBqe5smmmK+&oY53nCsnyKnb0H8Ui#f1x5vvsp&*Y*~|J
z8=oE$(c;U==UX^Zdi7Hu`3Amu_!pC!yk1q;jL}Jqh+^UM{%ex`(g%g=7qq54OAJN{
zoQ5+3m))*Mls>Xg3$aLX$qY7Hyb5RJbf{tFt`-N1l2yQV`@XnV2dvNUf28pn<DQmG
zsW{>IfrN(dZ{QNjn|k)qjbJdxT`n^<<Ef=4FXH6Z?fH`hHW$R{L@j_{$Ml+|XZGHm
zYxETk<~$~bB>Q5IW@4?Ev<9}f8Du6kyBp`&ZMGEL_)z1!i`L|cy8zIOL%+sj4ux@{
z7?KAYW^&5e3*s>(EM@GST%X8N_a*RX&StbtRrBb1IuGtqG6N5oomLO8zk5O1Ydi27
z`e$f@qat|IId8SW_Bd#WkXtZdtWC5dZ{|uYqn^h3qc=|KS-GD??`Frk<z73@1;<$x
zE4m-&PCa_|4tab&nsT{F4Str!qUK^ntLlkc&7IrmD9x2v#@DcY0UO6L>1bT#9*U!I
zNPcl=p`oF|VXE*|^V)-QcGef|taNtjHT58VC=C6|7W;BSG#>EGc14q6NvWfPIUbVJ
zl5{J3$}ALvJ5P&&`a8$?A%~X7G)EW<%oFBhc*Uh);9*3@X*pCVyo|G-3aN#CAh?}=
zUhv=9_kEh&WH!eqED_`bK)7C*#O+Mikazj>$?P{)V|uxfhN18Y7D3YI;ni@>U!1}j
z*hbc<MO#&5Y8Jh{t9ttrOoaz}LNl_TAc@~KBE9;jjkstHrb^6X_!IT$t#t0=Jk$6{
zUS$lgh!(UD?|CH^Y4!xY%@!#+sVic8<N~c&F<kS;j{YRRd&AN^Sns##mHD_cs#CVN
zV10y-1)`VjP`6ySjh{ZT@45y5J^EB{H)7u4I?!y#VYmRzf->(sQ0hHw6p{<mcsB3x
z9S|)SY_pb@VNtanFAT1mx;Hqu!Ex34>S=_Q70OyZf;(1Y4@>&%UZ9+#G7b!_tb(3q
zgxYx>O-tDaH%NI?{OpoVD(0QAlafQ?Wi!2E<j?&yCP!0HrCTv8eS1`&P<QLaQf~Ci
z)s>7#N%ZpGy)0E7O{_=e%J2zw6M1u#&?4To^j-ZUE4<pAd*0r}(u?pqJ(eBS#0u25
zi#3pCDUDcvZzFR$CDFg{%Uxg3406CT=S7u*N5qD1UF0=leq$-dZ8$0w<w?tj{8z>B
zQuQy(nIchnO7F%`&8QMOd3u1CSIm15e8$<ABcdgv8ZaXU=hG`nO+^a+EegUfwM5uY
z&f44UMKo+2ZAhYjOfmO)v8c}bm&=<s?2AO%$4|0G_`MUUSASWyLvP<fLl|y*D!$3r
z<ogEhSg7yvs1NkvTOB8;OPST$rHW}%#{?8_>==&nX^~`t%<QRSqxH%~uZh0X;;$~5
zTCs)klY0_h+XqC2=YB1g!9(9q8?@tFYA{XHem=E9xy1+w@IFVV`Jyb1%t%AYZK{59
zAlt%lU6VQVTWTNMgF2JC@{^19t@&tr+X7T=7tI;eT;74GnFv`#+hAigNVi-Aa<b?I
zB-UakLRi9?6A^1Gf2rrA0<K50R3F9ry&LC*ItGcw!MPqS6aK`sIwyFr{1)n6r}y?7
z!(Cm&4>9D`#lD(Z_GE03;J3>+O3taWZXG8D)4{uz(Hadchx*j#!s6_VV(WW?pdckw
zr@pD)@LU@G9Sx6%*YwQv*x$2$sFA#zzfh6OG~Wy|Gxqgeh}<L0b7}3qc(gh%x<Or=
z=3?T0$o8@_|FlU@ZWSo!Sy%zSaMz2=U%dH+fft^8;j=I7c;VR>p5oVYFW!-InG1Sx
z^?B(FPrP``3p-z2J(5@hFD`%KGcODf_}mLm<>J2h@fUWJ+*7Hg`q>wky?75XKJ(%&
z*2Lk1E56~y%O;v5m+MUvELfZI)#cRJ<7K~?*0ge|ClML}OLK?5vM9w+*E4Bt<0jdL
z%=0o5I5{BCD&|2pkLg%Y%th0etpQL9I#DgJ8i$BT)nwisvNoONrzi%I*3|XF(xNv1
zGQrAfwKZ+<qsDiuKe;MDb;bO%b4oElYBEgFnjGtH6@oE=-NEL;dTXeiPkgsmLcC_L
z5n10`D(dy2@B8}(m+7FGhM&y|Imit2eG+}FbZB5aIvgC);kJXJmSn$je-(i0`71r{
z6drD1W;MnyTk2?Ai0{|ro(76v9M;D95VJJ@l;$3L4=LtkFZ9_?OpLZ)D=aIveT_6e
zlGq;_2;0H-#|9)~9yh1@bDbPdxv-Skx*P-C{RTGH%`J%B$<8pvRsT8I@Q!-8kFc?E
z6l2HDSDl|jNF?S1{XsM&(Ebpb4qrY8oa?4Exr768ZXz;pa63GXy2{R($Li{!L#S+n
z6ILfA!g}|WET6psa<@|8thwwJ${{cGH4Xr`E%Fc4t>tW_*zo2{2-;hFcsrY#<j}9(
zm8fEJf4BgJpc&5gBG)(j+XbX*f2g3g;ZB`v$Zgu$&|baFEFtr7<)&@MR=r@1--a(u
zh1dJ_f&6%6AfAlbX4U1TZr`)brD*FNy(rKa7XI2nt^X<B2f*jH$sD)tLe6a(`N4#s
zIQ2&lv@X>l%&dR4ddiNf<Q#@Wy5ns9d4ue)AY_lHT65{EN_q{AV%WA8F|#EVU67rk
ZG+)H9F-z<$IUA2dkG*Bz6KSye|1TF4$CUs8

literal 0
HcmV?d00001

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
new file mode 100644
index 00000000..f83fded4
--- /dev/null
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -0,0 +1,3174 @@
+# Korean translation for Calibre-web
+# Copyright (C) 2022 EPUBGUIDE.NET
+# This file is distributed under the same license as the Calibre-web project
+# First korean translation by 내맘대로의 EPUBGUIDE.NET
+msgid ""
+msgstr ""
+"Project-Id-Version:  Calibre-web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"PO-Revision-Date: 2022-01-05 09:45+0900\n"
+"Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
+"Language: ko\n"
+"Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.9.0\n"
+
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
+msgid "not installed"
+msgstr "설치되지 않음"
+
+#: cps/about.py:47 cps/about.py:63
+msgid "installed"
+msgstr "설치됨"
+
+#: cps/about.py:145
+msgid "Statistics"
+msgstr "통계"
+
+#: cps/admin.py:144
+msgid "Server restarted, please reload page"
+msgstr "서버를 다시 시작했습니다. 새로고침 해주세요."
+
+#: cps/admin.py:146
+msgid "Performing shutdown of server, please close window"
+msgstr "서버를 종료하는 중입니다. 창을 닫아주세요."
+
+#: cps/admin.py:154
+msgid "Reconnect successful"
+msgstr "재연결 성공"
+
+#: cps/admin.py:157
+msgid "Unknown command"
+msgstr "알 수 없는 명령"
+
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
+#: cps/uploader.py:103
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: cps/admin.py:188
+msgid "Admin page"
+msgstr "관리자 페이지"
+
+#: cps/admin.py:207
+msgid "Basic Configuration"
+msgstr "\"기본 설"
+
+#: cps/admin.py:244
+msgid "UI Configuration"
+msgstr "UI 설정"
+
+#: cps/admin.py:277 cps/templates/admin.html:50
+msgid "Edit Users"
+msgstr "사용자 관리"
+
+#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "모두"
+
+#: cps/admin.py:343 cps/admin.py:1606
+msgid "User not found"
+msgstr "사용자를 찾을 수 없습니다."
+
+#: cps/admin.py:357
+msgid "{} users deleted successfully"
+msgstr "{} 사용자를 성공적으로 삭제하였습니다."
+
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "모두 보기"
+
+#: cps/admin.py:400 cps/admin.py:406
+msgid "Malformed request"
+msgstr "잘못된 요청"
+
+#: cps/admin.py:418 cps/admin.py:1484
+msgid "Guest Name can't be changed"
+msgstr "Guest 이름은 수정할 수 없습니다."
+
+#: cps/admin.py:430
+msgid "Guest can't have this role"
+msgstr "Guest는 이 권한을 사용할 수 없습니다."
+
+#: cps/admin.py:442 cps/admin.py:1442
+msgid "No admin user remaining, can't remove admin role"
+msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
+
+#: cps/admin.py:446 cps/admin.py:460
+msgid "Value has to be true or false"
+msgstr "true 또는 false만 사용할 수 있습니다."
+
+#: cps/admin.py:448
+msgid "Invalid role"
+msgstr "잘못된 권한"
+
+#: cps/admin.py:452
+msgid "Guest can't have this view"
+msgstr "Guest는 이 view를 사용할 수 없습니다."
+
+#: cps/admin.py:462
+msgid "Invalid view"
+msgstr "잘못된 view"
+
+#: cps/admin.py:465
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없습니다. "
+
+#: cps/admin.py:469
+msgid "No Valid Locale Given"
+msgstr "유효한 로케일이 지정되지 않았습니다."
+
+#: cps/admin.py:480
+msgid "No Valid Book Language Given"
+msgstr "유효한 로케일이 지정되지 않았습니다."
+
+#: cps/admin.py:482
+msgid "Parameter not found"
+msgstr "매개변수를 찾을 수 없음 "
+
+#: cps/admin.py:533
+msgid "Invalid Read Column"
+msgstr "잘못된 읽기 열 "
+
+#: cps/admin.py:539
+msgid "Invalid Restricted Column"
+msgstr "잘못된 제한된 열 "
+
+#: cps/admin.py:560 cps/admin.py:1323
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web 설정이 업데이트 되었습니다."
+
+#: cps/admin.py:572
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Kobo Token을 삭제하시겠습니까?"
+
+#: cps/admin.py:574
+msgid "Do you really want to delete this domain?"
+msgstr "이 도메인을 삭제하시겠습니까?"
+
+#: cps/admin.py:576
+msgid "Do you really want to delete this user?"
+msgstr "이 사용자를 삭제하시겠습니까?"
+
+#: cps/admin.py:578
+msgid "Are you sure you want to delete this shelf?"
+msgstr "이 서재를 삭제하시겠습니까?"
+
+#: cps/admin.py:580
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:582
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까? "
+
+#: cps/admin.py:584
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까? "
+
+#: cps/admin.py:586
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까? "
+
+#: cps/admin.py:588
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
+
+#: cps/admin.py:590
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까? "
+
+#: cps/admin.py:592
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
+
+#: cps/admin.py:743
+msgid "Tag not found"
+msgstr "태그를 찾을 수 없습니다."
+
+#: cps/admin.py:755
+msgid "Invalid Action"
+msgstr "잘못된 액션"
+
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "거부됨"
+
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "허용됨"
+
+#: cps/admin.py:913
+msgid "{} sync entries deleted"
+msgstr "{} 동기화 항목이 삭제되었습니다."
+
+#: cps/admin.py:1036
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않았습니다."
+
+#: cps/admin.py:1081
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1087
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "액세스 로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1117
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력하십시오."
+
+#: cps/admin.py:1123
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
+
+#: cps/admin.py:1126
+msgid "Please Enter a LDAP Service Account"
+msgstr "LDAP 서비스 계정을 입력하십시오"
+
+#: cps/admin.py:1131
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
+
+#: cps/admin.py:1133
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있습니다."
+
+#: cps/admin.py:1137
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
+
+#: cps/admin.py:1139
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있습니다."
+
+#: cps/admin.py:1146
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
+
+#: cps/admin.py:1148
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있습니다."
+
+#: cps/admin.py:1155
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "LDAP CACertificate, 인증서 또는 키 위치가 유효하지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
+msgid "Settings DB is not Writeable"
+msgstr "설정 DB에 쓰기 권한이 없습니다."
+
+#: cps/admin.py:1208
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "DB 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1223
+msgid "DB is not Writeable"
+msgstr "쓰기 권한이 없는 DB"
+
+#: cps/admin.py:1235
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "키 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1239
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "인증서 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
+
+#: cps/admin.py:1346
+msgid "Database Settings updated"
+msgstr "데이터베이스 설정이 업데이트 되었습니다"
+
+#: cps/admin.py:1354
+msgid "Database Configuration"
+msgstr "데이터베이스 구성"
+
+#: cps/admin.py:1370 cps/web.py:1479
+msgid "Please fill out all fields!"
+msgstr "모든 필드를 채워주십시오!"
+
+#: cps/admin.py:1378
+msgid "E-mail is not from valid domain"
+msgstr "이메일이 유효한 도메인에서 온 것이 아닙니다."
+
+#: cps/admin.py:1384 cps/admin.py:1534
+msgid "Add new user"
+msgstr "새 사용자 추가"
+
+#: cps/admin.py:1395
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "사용자 '%(user)s'이(가) 생성됨"
+
+#: cps/admin.py:1401
+msgid "Found an existing account for this e-mail address or name."
+msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
+
+#: cps/admin.py:1421
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "사용자 '%(nick)s'이(가) 삭제되었습니다."
+
+#: cps/admin.py:1423 cps/admin.py:1424
+msgid "Can't delete Guest User"
+msgstr "게스트 사용자는 삭제할 수 없습니다"
+
+#: cps/admin.py:1427
+msgid "No admin user remaining, can't delete user"
+msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
+
+#: cps/admin.py:1500 cps/admin.py:1625
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "사용자 %(nick)s 편집"
+
+#: cps/admin.py:1504
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "사용자 '%(nick)s'가 업데이트 되었습니다."
+
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
+msgid "An unknown error occurred. Please try again later."
+msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
+
+#: cps/admin.py:1543 cps/templates/admin.html:98
+msgid "Edit E-mail Server Settings"
+msgstr "이메일 서버 설정 편집"
+
+#: cps/admin.py:1562
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail 계정 인증 성공"
+
+#: cps/admin.py:1588
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "%(email)s에 보내기 위해 대기 중인 테스트 전자 메일입니다. 결과는 작업을 확인하십시오."
+
+#: cps/admin.py:1591
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/admin.py:1593
+msgid "Please configure your e-mail address first..."
+msgstr "먼저 이메일 주소를 구성하십시오..."
+
+#: cps/admin.py:1595
+msgid "E-mail server settings updated"
+msgstr "이메일 서버 설정 업데이트됨"
+
+#: cps/admin.py:1637
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "사용자 %(user)s의 비밀번호 재설정"
+
+#: cps/admin.py:1643 cps/web.py:1444
+msgid "Please configure the SMTP mail settings first..."
+msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
+
+#: cps/admin.py:1654
+msgid "Logfile viewer"
+msgstr "로그 파일 뷰어"
+
+#: cps/admin.py:1720
+msgid "Requesting update package"
+msgstr "업데이트 패키지 요청"
+
+#: cps/admin.py:1721
+msgid "Downloading update package"
+msgstr "업데이트 패키지 다운로드"
+
+#: cps/admin.py:1722
+msgid "Unzipping update package"
+msgstr "업데이트 패키지 압축 풀기"
+
+#: cps/admin.py:1723
+msgid "Replacing files"
+msgstr "파일 교체"
+
+#: cps/admin.py:1724
+msgid "Database connections are closed"
+msgstr "데이터베이스 연결이 닫힙니다."
+
+#: cps/admin.py:1725
+msgid "Stopping server"
+msgstr "서버 중지"
+
+#: cps/admin.py:1726
+msgid "Update finished, please press okay and reload page"
+msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요."
+
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
+msgid "Update failed:"
+msgstr "업데이트 실패:"
+
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+msgid "HTTP Error"
+msgstr "HTTP 오류"
+
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
+msgid "Connection error"
+msgstr "연결 오류"
+
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
+msgid "Timeout while establishing connection"
+msgstr "연결 설정 중 시간 초과"
+
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
+msgid "General error"
+msgstr "일반 오류"
+
+#: cps/admin.py:1731
+msgid "Update file could not be saved in temp dir"
+msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다."
+
+#: cps/admin.py:1732
+msgid "Files could not be replaced during update"
+msgstr "업데이트하는 동안 파일을 교체할 수 없습니다."
+
+#: cps/admin.py:1756
+msgid "Failed to extract at least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다."
+
+#: cps/admin.py:1801
+msgid "Failed to Create at Least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다."
+
+#: cps/admin.py:1814
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "오류: %(ldaperror)s"
+
+#: cps/admin.py:1818
+msgid "Error: No user returned in response of LDAP server"
+msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다."
+
+#: cps/admin.py:1851
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다."
+
+#: cps/admin.py:1853
+msgid "{} User Successfully Imported"
+msgstr "{} 사용자 가져오기 성공"
+
+#: cps/converter.py:30
+msgid "not configured"
+msgstr "구성되지 않음"
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr "실행 권한 누락"
+
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다."
+
+#: cps/editbooks.py:300 cps/editbooks.py:302
+msgid "Book Format Successfully Deleted"
+msgstr "책 형식이 성공적으로 삭제되었습니다."
+
+#: cps/editbooks.py:309 cps/editbooks.py:311
+msgid "Book Successfully Deleted"
+msgstr "책이 성공적으로 삭제되었습니다."
+
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다."
+
+#: cps/editbooks.py:410
+msgid "edit metadata"
+msgstr "메타데이터 편집"
+
+#: cps/editbooks.py:458
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다."
+
+#: cps/editbooks.py:494 cps/editbooks.py:958
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다."
+
+#: cps/editbooks.py:634 cps/editbooks.py:985
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다."
+
+#: cps/editbooks.py:638 cps/editbooks.py:989
+msgid "File to be uploaded must have an extension"
+msgstr "업로드할 파일에는 확장자가 있어야 합니다."
+
+#: cps/editbooks.py:650
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
+
+#: cps/editbooks.py:655
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s 파일을 저장하지 못했습니다."
+
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "데이터베이스 오류: %(error)s."
+
+#: cps/editbooks.py:678
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다."
+
+#: cps/editbooks.py:814
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "식별자는 대소문자를 구분하지 않으며 이전 식별자를 덮어씁니다."
+
+#: cps/editbooks.py:848
+msgid "Metadata successfully updated"
+msgstr "메타데이터가 성공적으로 업데이트되었습니다."
+
+#: cps/editbooks.py:861
+msgid "Error editing book, please check logfile for details"
+msgstr "책을 수정하는 동안 오류가 발생했습니다. 자세한 내용은 로그 파일을 확인하세요."
+
+#: cps/editbooks.py:899
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "업로드한 책이 라이브러리에 있을 수 있습니다. 새로 업로드하기 전에 변경하는 것이 좋습니다."
+
+#: cps/editbooks.py:997
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다."
+
+#: cps/editbooks.py:1016
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
+
+#: cps/editbooks.py:1063
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "파일 %(file)s 업로드됨"
+
+#: cps/editbooks.py:1088
+msgid "Source or destination format for conversion missing"
+msgstr "변환을 위한 소스 또는 대상 형식이 누락되었습니다."
+
+#: cps/editbooks.py:1096
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "책이 %(book_format)s(으)로 변환하기 위해 대기 중입니다."
+
+#: cps/editbooks.py:1100
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "이 책을 변환하는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드라이브를 비활성화했다가 다시 활성화해 보세요."
+
+#: cps/gdrive.py:95
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "콜백 도메인이 확인되지 않았습니다. 단계에 따라 Google 개발자 콘솔에서 도메인을 확인하세요."
+
+#: cps/helper.py:77
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
+
+#: cps/helper.py:83 cps/tasks/convert.py:73
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s을(를) Google 드라이브에서 찾을 수 없음: %(fn)s"
+
+#: cps/helper.py:88
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s을(를) 찾을 수 없음: %(fn)s"
+
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "킨들로 보내기"
+
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
+
+#: cps/helper.py:109
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web 테스트 이메일"
+
+#: cps/helper.py:110
+msgid "Test e-mail"
+msgstr "테스트 이메일"
+
+#: cps/helper.py:127
+msgid "Get Started with Calibre-Web"
+msgstr "Calibre-Web 시작하기"
+
+#: cps/helper.py:132
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "사용자 등록 이메일: %(name)s"
+
+#: cps/helper.py:143 cps/helper.py:149
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "%(orig)s를 %(format)s로 변환하고 킨들로 보내기"
+
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "킨들에 %(format)s 보내기"
+
+#: cps/helper.py:216 cps/tasks/convert.py:90
+#, python-format
+msgid "%(book)s send to Kindle"
+msgstr "%(book)s을 킨들로 보내기"
+
+#: cps/helper.py:221
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "요청한 파일을 읽을 수 없습니다. 권한이 잘못되었을 수 있습니다."
+
+#: cps/helper.py:313
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "책 %(id)s에 대한 책 폴더를 삭제하지 못했습니다. 경로에 하위 폴더가 있습니다: %(path)s"
+
+#: cps/helper.py:319
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "%(id)s 도서 삭제 실패: %(message)s"
+
+#: cps/helper.py:330
+#, python-format
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr "데이터베이스에서만 책 %(id)s 을(를) 삭제 중, 데이터베이스의 책 경로가 유효하지 않음: %(path)s"
+
+#: cps/helper.py:385
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "제목 이름을 '%(src)s'에서 '%(dest)s'(으)로 변경하지 못했습니다. 오류: %(error)s"
+
+#: cps/helper.py:400
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "'%(src)s' 경로의 파일 이름을 '%(dest)s'(으)로 변경하지 못했습니다. 오류: %(error)s"
+
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Google 드라이브에서 %(file)s 파일을 찾을 수 없습니다."
+
+#: cps/helper.py:464
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다."
+
+#: cps/helper.py:504 cps/web.py:1659
+msgid "Found an existing account for this e-mail address"
+msgstr "등록되어 있는 이메일 주소입니다."
+
+#: cps/helper.py:512
+msgid "This username is already taken"
+msgstr "등록되어 있는 username입니다."
+
+#: cps/helper.py:522
+msgid "Invalid e-mail address format"
+msgstr "이메일 주소 형식이 잘못되었습니다."
+
+#: cps/helper.py:595
+msgid "Error Downloading Cover"
+msgstr "표지 다운로드 중 오류 발생"
+
+#: cps/helper.py:598
+msgid "Cover Format Error"
+msgstr "표지 형식 오류"
+
+#: cps/helper.py:608
+msgid "Failed to create path for cover"
+msgstr "표지 경로 생성 실패"
+
+#: cps/helper.py:624
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "표지 파일이 유효한 이미지 파일이 아니거나 저장할 수 없습니다."
+
+#: cps/helper.py:635
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "jpg/jpeg/png/webp/bmp 파일만 표지 파일로 지원됩니다."
+
+#: cps/helper.py:648
+msgid "Invalid cover file content"
+msgstr "잘못된 표지 파일 콘텐츠"
+
+#: cps/helper.py:652
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "jpg/jpeg 파일만 표지 파일로 지원됩니다."
+
+#: cps/helper.py:704
+msgid "Unrar binary file not found"
+msgstr "Unrar 바이너리 파일을 찾을 수 없습니다."
+
+#: cps/helper.py:715
+msgid "Error excecuting UnRar"
+msgstr "UnRar 실행 오류"
+
+#: cps/helper.py:763
+msgid "Waiting"
+msgstr "대기중"
+
+#: cps/helper.py:765
+msgid "Failed"
+msgstr "실패"
+
+#: cps/helper.py:767
+msgid "Started"
+msgstr "시작됨"
+
+#: cps/helper.py:769
+msgid "Finished"
+msgstr "종료"
+
+#: cps/helper.py:771
+msgid "Unknown Status"
+msgstr "알 수 없는 상태"
+
+#: cps/kobo_auth.py:127
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr "kobo 장치에 대한 유효한 api_endpoint를 얻으려면 로컬 호스트가 아닌 곳에서 calibre-web에 액세스하십시오."
+
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
+msgid "Kobo Setup"
+msgstr "Kobo 설정"
+
+#: cps/oauth_bb.py:77
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "%(provider)s에 등록"
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
+
+#: cps/oauth_bb.py:148
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 성공적으로 연결됨"
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "로그인 실패, OAuth 계정과 연결된 사용자 없음"
+
+#: cps/oauth_bb.py:197
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 연결 해제 성공"
+
+#: cps/oauth_bb.py:202
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "%(oauth)s에 연결 해제 실패"
+
+#: cps/oauth_bb.py:205
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "%(oauth)s에 연결되지 않음"
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "GitHub에 로그인하지 못했습니다."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "GitHub에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "구글 로그인에 실패했습니다."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Google에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "GitHub 인증 오류: {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Google 인증 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Google 인증 오류: {}"
+
+#: cps/opds.py:384
+msgid "{} Stars"
+msgstr "{} Stars"
+
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
+msgid "Login"
+msgstr "로그인"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "토큰을 찾을 수 없습니다."
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "토큰이 만료되었습니다."
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "성공! 기기로 돌아가주세요."
+
+#: cps/render_template.py:39 cps/web.py:416
+msgid "Books"
+msgstr "책"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "최근 책 보기"
+
+#: cps/render_template.py:42 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "인기있는 책"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "주목받는 책 보기"
+
+#: cps/render_template.py:46 cps/render_template.py:51
+msgid "Downloaded Books"
+msgstr "다운로드된 책"
+
+#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "다운로드된 책 보기"
+
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+msgid "Top Rated Books"
+msgstr "평점이 높은 책"
+
+#: cps/render_template.py:58 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "평점이 높은 책 보기"
+
+#: cps/render_template.py:59 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:676
+msgid "Read Books"
+msgstr "읽은 책"
+
+#: cps/render_template.py:61
+msgid "Show read and unread"
+msgstr "읽은 책과 읽지 않은 책 보기"
+
+#: cps/render_template.py:63 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:679
+msgid "Unread Books"
+msgstr "읽지 않은 책"
+
+#: cps/render_template.py:65
+msgid "Show unread"
+msgstr "읽지 않은 책 보기"
+
+#: cps/render_template.py:66
+msgid "Discover"
+msgstr "발견"
+
+#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "무작위 추천"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1041
+msgid "Categories"
+msgstr "카테고리"
+
+#: cps/render_template.py:71 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "카테고리별 보기"
+
+#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+msgid "Series"
+msgstr "시리즈"
+
+#: cps/render_template.py:74 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "시리즈별 보기"
+
+#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "저자"
+
+#: cps/render_template.py:77 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "저자별 보기"
+
+#: cps/render_template.py:79 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:925
+msgid "Publishers"
+msgstr "출판사"
+
+#: cps/render_template.py:81 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "출판사별 보기"
+
+#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1018
+msgid "Languages"
+msgstr "언어"
+
+#: cps/render_template.py:85 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "언어별 보기"
+
+#: cps/render_template.py:86 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "평점"
+
+#: cps/render_template.py:88 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "평점별 보기"
+
+#: cps/render_template.py:89 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "파일 유형"
+
+#: cps/render_template.py:91 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "파일 유형별 보기"
+
+#: cps/render_template.py:93 cps/web.py:703
+msgid "Archived Books"
+msgstr "보관된 책"
+
+#: cps/render_template.py:95 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "보관된 책 보기"
+
+#: cps/render_template.py:97 cps/web.py:780
+msgid "Books List"
+msgstr "책 목록"
+
+#: cps/render_template.py:99 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "책 목록 보기"
+
+#: cps/shelf.py:67 cps/shelf.py:121
+msgid "Invalid shelf specified"
+msgstr "잘못된 책장 지정"
+
+#: cps/shelf.py:73
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다."
+
+#: cps/shelf.py:82
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
+
+#: cps/shelf.py:107
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "책장에 책이 등록됨: %(sname)s"
+
+#: cps/shelf.py:126
+msgid "You are not allowed to add a book to the shelf"
+msgstr "책장에 책을 추가할 권한이 없습니다."
+
+#: cps/shelf.py:144
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "책장에 이미 책이 등록됨:  %(name)s"
+
+#: cps/shelf.py:156
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "책이 책장에 등록됨: %(sname)s"
+
+#: cps/shelf.py:163
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "책장에 책을 추가할 수 없음: %(sname)s"
+
+#: cps/shelf.py:209
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "책이 책장에서 삭제됨: %(sname)s"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다."
+
+#: cps/shelf.py:228 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "책장 추가"
+
+#: cps/shelf.py:237
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다."
+
+#: cps/shelf.py:239
+msgid "Edit a shelf"
+msgstr "책장 편집"
+
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다."
+
+#: cps/shelf.py:262
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s 책장이 추가됨"
+
+#: cps/shelf.py:265
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s 책장이 변경됨"
+
+#: cps/shelf.py:279
+msgid "There was an error"
+msgstr "오류가 발생하였습니다."
+
+#: cps/shelf.py:301
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
+
+#: cps/shelf.py:312
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
+
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "책이 성공적으로 삭제되었습니다."
+
+#: cps/shelf.py:382
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "책장 순서 변경: '%(name)s'"
+
+#: cps/shelf.py:452
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "책장: '%(name)s'"
+
+#: cps/shelf.py:456
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
+
+#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+msgid "Unexpected data while reading update information"
+msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
+
+#: cps/updater.py:410 cps/updater.py:521
+msgid "No update available. You already have the latest version installed"
+msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다."
+
+#: cps/updater.py:428
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:446
+msgid "Could not fetch update information"
+msgstr "업데이트 정보를 가져올 수 없습니다"
+
+#: cps/updater.py:456
+msgid "Click on the button below to update to the latest stable version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "최신 안정 버전 %(version)s으로 업데이트하려면 아래 버튼을 클릭하세요."
+
+#: cps/updater.py:507
+msgid "No release information available"
+msgstr "출시 정보가 없습니다"
+
+#: cps/templates/index.html:5 cps/web.py:440
+msgid "Discover (Random Books)"
+msgstr "발견(무작위 도서)"
+
+#: cps/web.py:471
+msgid "Hot Books (Most Downloaded)"
+msgstr "인기있는 책(가장 많이 다운로드됨)"
+
+#: cps/web.py:507
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s이(가) 다운로드한 책"
+
+#: cps/web.py:539
+#, python-format
+msgid "Author: %(name)s"
+msgstr "저자: %(name)s"
+
+#: cps/web.py:554
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "출판사: %(name)s"
+
+#: cps/web.py:569
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "시리즈: %(serie)s"
+
+#: cps/web.py:582
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "평가: %(rating)s 별"
+
+#: cps/web.py:597
+#, python-format
+msgid "File format: %(format)s"
+msgstr "파일 유형: %(format)s"
+
+#: cps/web.py:615
+#, python-format
+msgid "Category: %(name)s"
+msgstr "카테고리: %(name)s"
+
+#: cps/web.py:631
+#, python-format
+msgid "Language: %(name)s"
+msgstr "언어: %(name)s"
+
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
+msgid "Advanced Search"
+msgstr "상세 검색"
+
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
+#: cps/templates/index.xml:11 cps/templates/layout.html:45
+#: cps/templates/layout.html:48 cps/templates/search_form.html:226
+#: cps/web.py:750 cps/web.py:1077
+msgid "Search"
+msgstr "검색"
+
+#: cps/templates/admin.html:16 cps/web.py:903
+msgid "Downloads"
+msgstr "다운로드"
+
+#: cps/web.py:980
+msgid "Ratings list"
+msgstr "평점 목록"
+
+#: cps/web.py:1001
+msgid "File formats list"
+msgstr "파일 유형 목록"
+
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+msgid "Tasks"
+msgstr "작업"
+
+#: cps/web.py:1215
+msgid "Published after "
+msgstr "Published after"
+
+#: cps/web.py:1222
+msgid "Published before "
+msgstr "Published before"
+
+#: cps/web.py:1244
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "평점 <= %(rating)s"
+
+#: cps/web.py:1246
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "평점 >= %(rating)s"
+
+#: cps/web.py:1248
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "읽은 상태 = %(status)s"
+
+#: cps/web.py:1353
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오."
+
+#: cps/web.py:1449
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다."
+
+#: cps/web.py:1453
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "책을 보내는 중에 오류 발생: %(res)s"
+
+#: cps/web.py:1455
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
+
+#: cps/web.py:1472
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
+
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
+msgid "Register"
+msgstr "등록"
+
+#: cps/web.py:1507
+msgid "Your e-mail is not allowed to register"
+msgstr "이메일을 등록할 수 없습니다."
+
+#: cps/web.py:1510
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "확인을 위한 이메일이 발송되었습니다."
+
+#: cps/web.py:1524
+msgid "Cannot activate LDAP authentication"
+msgstr "LDAP 인증을 활성화할 수 없습니다."
+
+#: cps/web.py:1543
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
+
+#: cps/web.py:1549
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "로그인 실패: %(message)s"
+
+#: cps/web.py:1553 cps/web.py:1578
+msgid "Wrong Username or Password"
+msgstr "잘못된 사용자명 또는 비밀번호"
+
+#: cps/web.py:1560
+msgid "New Password was send to your email address"
+msgstr "새 비밀번호가 이메일로 전송되었습니다."
+
+#: cps/web.py:1566
+msgid "Please enter valid username to reset password"
+msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오."
+
+#: cps/web.py:1573
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "로그인을 할 수 없음: '%(nickname)s"
+
+#: cps/web.py:1639 cps/web.py:1688
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s 프로필"
+
+#: cps/web.py:1655
+msgid "Profile updated"
+msgstr "프로필이 업데이트 됨"
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다."
+
+#: cps/tasks/convert.py:137
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Calibre ebook-convert %(tool)s을(를) 찾을 수 없습니다."
+
+#: cps/tasks/convert.py:163
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s 형식을 찾을 수 없습니다."
+
+#: cps/tasks/convert.py:167
+msgid "Ebook converter failed with unknown error"
+msgstr "알 수 없는 오류로 인해 전자책 변환이 실패했습니다."
+
+#: cps/tasks/convert.py:177
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Kepubify 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "변환된 파일을 찾을 수 없거나 %(folder)s 폴더에 하나 이상의 파일이 존재합니다."
+
+#: cps/tasks/convert.py:222
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "\"전자책 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:245
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "오류로 인한 Calibre 실패: %(error)s"
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "사용자"
+
+#: cps/templates/admin.html:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "사용자명"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "이메일 주소"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to Kindle E-mail Address"
+msgstr "킨들로 보내기 이메일 주소"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "관리자"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "비밀번호"
+
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
+#: cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "업로드"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "다운로드"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "책 보기"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "편집"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "삭제"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "공개 책장"
+
+#: cps/templates/admin.html:51
+msgid "Add New User"
+msgstr "사용자 추가"
+
+#: cps/templates/admin.html:53
+msgid "Import LDAP Users"
+msgstr "LDAP 사용자 가져오기"
+
+#: cps/templates/admin.html:60
+msgid "E-mail Server Settings"
+msgstr "이메일 서버 설정"
+
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "SMTP Hostname"
+
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "SMTP Port"
+
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "암호화"
+
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "SMTP Login"
+
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "From E-mail"
+
+#: cps/templates/admin.html:88
+msgid "E-Mail Service"
+msgstr "E-Mail Service"
+
+#: cps/templates/admin.html:89
+msgid "Gmail via Oauth2"
+msgstr "Gmail via Oauth2"
+
+#: cps/templates/admin.html:104
+msgid "Configuration"
+msgstr "환경 설정"
+
+#: cps/templates/admin.html:107
+msgid "Calibre Database Directory"
+msgstr "Calibre DB 폴더"
+
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Log Level"
+
+#: cps/templates/admin.html:115
+msgid "Port"
+msgstr "Port"
+
+#: cps/templates/admin.html:120
+msgid "External Port"
+msgstr "External Port"
+
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "페이지당 보여 줄 책 수"
+
+#: cps/templates/admin.html:131
+msgid "Uploads"
+msgstr "업로드"
+
+#: cps/templates/admin.html:135
+msgid "Anonymous Browsing"
+msgstr "익명 보기"
+
+#: cps/templates/admin.html:139
+msgid "Public Registration"
+msgstr "공개 등록"
+
+#: cps/templates/admin.html:143
+msgid "Magic Link Remote Login"
+msgstr "Magic Link Remote Login"
+
+#: cps/templates/admin.html:147
+msgid "Reverse Proxy Login"
+msgstr "Reverse Proxy Login"
+
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr "Reverse Proxy Header Name"
+
+#: cps/templates/admin.html:157
+msgid "Edit Calibre Database Configuration"
+msgstr "Calibre Database 환경 설정 편집"
+
+#: cps/templates/admin.html:158
+msgid "Edit Basic Configuration"
+msgstr "기본 환경 설정 편집"
+
+#: cps/templates/admin.html:159
+msgid "Edit UI Configuration"
+msgstr "UI 환경 설정 편집"
+
+#: cps/templates/admin.html:164
+msgid "Administration"
+msgstr "관리"
+
+#: cps/templates/admin.html:165
+msgid "Download Debug Package"
+msgstr "Debug Package 다운로드"
+
+#: cps/templates/admin.html:166
+msgid "View Logs"
+msgstr "로그 보기"
+
+#: cps/templates/admin.html:169
+msgid "Reconnect Calibre Database"
+msgstr "Calibre DB 다시 연결"
+
+#: cps/templates/admin.html:170
+msgid "Restart"
+msgstr "재시작"
+
+#: cps/templates/admin.html:171
+msgid "Shutdown"
+msgstr "종료"
+
+#: cps/templates/admin.html:176
+msgid "Update"
+msgstr "업데이트"
+
+#: cps/templates/admin.html:180
+msgid "Version"
+msgstr "버전"
+
+#: cps/templates/admin.html:181
+msgid "Details"
+msgstr "세부 정보"
+
+#: cps/templates/admin.html:187
+msgid "Current version"
+msgstr "현재 버전"
+
+#: cps/templates/admin.html:194
+msgid "Check for Update"
+msgstr "업데이트 확인"
+
+#: cps/templates/admin.html:195
+msgid "Perform Update"
+msgstr "업데이트 실행"
+
+#: cps/templates/admin.html:208
+msgid "Are you sure you want to restart?"
+msgstr "재시작을 하시겠습니까?"
+
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
+msgid "OK"
+msgstr "예"
+
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "취소"
+
+#: cps/templates/admin.html:226
+msgid "Are you sure you want to shutdown?"
+msgstr "종료를 하시겠습니까?"
+
+#: cps/templates/admin.html:238
+msgid "Updating, please do not reload this page"
+msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "via"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "In Library"
+
+#: cps/templates/author.html:26 cps/templates/index.html:72
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
+msgid "Sort according to book date, newest first"
+msgstr "책 목록 정렬, 최신순"
+
+#: cps/templates/author.html:27 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
+msgid "Sort according to book date, oldest first"
+msgstr "책 목록 정렬, 오래된 순"
+
+#: cps/templates/author.html:28 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
+msgid "Sort title in alphabetical order"
+msgstr "가나다 순 정렬"
+
+#: cps/templates/author.html:29 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
+msgid "Sort title in reverse alphabetical order"
+msgstr "가나다 역순 정렬"
+
+#: cps/templates/author.html:30 cps/templates/index.html:78
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
+msgid "Sort according to publishing date, newest first"
+msgstr "발행일 순으로 정렬, 최신순"
+
+#: cps/templates/author.html:31 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
+msgid "Sort according to publishing date, oldest first"
+msgstr "발행일 순으로 정렬, 오래된 순"
+
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:111 cps/templates/search.html:65
+#: cps/templates/shelf.html:54
+msgid "reduce"
+msgstr "reduce"
+
+#: cps/templates/author.html:101
+msgid "More by"
+msgstr "More by"
+
+#: cps/templates/book_edit.html:10
+msgid "Delete Book"
+msgstr "책 삭제"
+
+#: cps/templates/book_edit.html:13
+msgid "Delete formats:"
+msgstr "유형 삭제"
+
+#: cps/templates/book_edit.html:24
+msgid "Convert book format:"
+msgstr "책 유형 변경"
+
+#: cps/templates/book_edit.html:29
+msgid "Convert from:"
+msgstr "변경전 유형:"
+
+#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+msgid "select an option"
+msgstr "옵션 선택"
+
+#: cps/templates/book_edit.html:36
+msgid "Convert to:"
+msgstr "변경후 유형:"
+
+#: cps/templates/book_edit.html:45
+msgid "Convert book"
+msgstr "책 변경"
+
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "책 제목"
+
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "저자"
+
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "책 소개"
+
+#: cps/templates/book_edit.html:72
+msgid "Identifiers"
+msgstr "식별자"
+
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+msgid "Identifier Type"
+msgstr "식별자 유형"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Value"
+msgstr "식별자 값"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "삭제"
+
+#: cps/templates/book_edit.html:82
+msgid "Add Identifier"
+msgstr "식별자 추가"
+
+#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "태그"
+
+#: cps/templates/book_edit.html:94
+msgid "Series ID"
+msgstr "시리즈 ID"
+
+#: cps/templates/book_edit.html:98
+msgid "Rating"
+msgstr "평점"
+
+#: cps/templates/book_edit.html:103
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "URL로 표지 추가(JPEG - 이미지를 다운로드 하여 DB에 저장합니다)"
+
+#: cps/templates/book_edit.html:107
+msgid "Upload Cover from Local Disk"
+msgstr "로컬 디스크에서 표지 업로드"
+
+#: cps/templates/book_edit.html:112
+msgid "Published Date"
+msgstr "출간일"
+
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "출판사"
+
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "언어"
+
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "예"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "아니오"
+
+#: cps/templates/book_edit.html:200
+msgid "Upload Format"
+msgstr "업로드 유형"
+
+#: cps/templates/book_edit.html:208
+msgid "View Book on Save"
+msgstr "저장 후 책 보기"
+
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+msgid "Fetch Metadata"
+msgstr "메타정보 가져오기"
+
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "저장"
+
+#: cps/templates/book_edit.html:232
+msgid "Keyword"
+msgstr "키워드"
+
+#: cps/templates/book_edit.html:233
+msgid "Search keyword"
+msgstr "키워드 검색"
+
+#: cps/templates/book_edit.html:239
+msgid "Click the cover to load metadata to the form"
+msgstr "표지를 클릭하여 양식에 메타데이터 로드"
+
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+msgid "Loading..."
+msgstr "불러오는 중..."
+
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "닫기"
+
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+msgid "Source"
+msgstr "출처"
+
+#: cps/templates/book_edit.html:286
+msgid "Search error!"
+msgstr "오류 검색!"
+
+#: cps/templates/book_edit.html:287
+msgid "No Result(s) found! Please try another keyword."
+msgstr "검색 결과가 없습니다! 다른 키워드를 시도하십시오."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "이 필드는 필수 항목입니다."
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "선택한 책 병합"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "선택 제거"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "저자 및 제목 교환"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "자동으로 제목 정렬 업데이트"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "자동으로 작성자 정렬 업데이트"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "제목 입력"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "제목"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "제목 정렬 입력"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "제목 정렬"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "저자 정렬 입력"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "저자 정렬"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "저자 입력"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "카테고리 입력"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "시리즈 입력"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "시리즈 색인"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "언어 입력"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "출간일"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "출판사 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "코멘트 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "코멘트"
+
+#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
+#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
+#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
+#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+msgid "Enter "
+msgstr "입력"
+
+#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "정말 확신합니까?"
+
+#: cps/templates/book_table.html:114
+msgid "Books with Title will be merged from:"
+msgstr "제목이 있는 책은 다음에서 병합됩니다."
+
+#: cps/templates/book_table.html:118
+msgid "Into Book with Title:"
+msgstr "제목이 있는 책으로:"
+
+#: cps/templates/book_table.html:123
+msgid "Merge"
+msgstr "병합"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Calibre Database 위치"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Google 드라이브를 사용하시겠습니까?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "구글 드라이브 인증"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Google Drive Calibre 폴더"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr "Metadata Watch Channel ID"
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "취소"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "새 db 위치가 잘못되었습니다. 올바른 경로를 입력하십시오."
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "서버 구성"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Server Port"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 인증서 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 키 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr "업데이트 취소"
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr "안정버전"
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr "실험버전"
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr "신뢰할 수 있는 호스트(쉼표로 구분)"
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr "Logfile 설정"
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "로그 파일의 위치 및 이름(항목이 없는 경우 calibre-web.log)"
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr "액세스 로그 활성화"
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "액세스 로그 파일의 위치 및 이름(항목이 없는 경우 access.log)"
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr "기능 설정"
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr "제목과 저자가 영어가 아닌 경우 원어로 저장하기"
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr "업로드 활성화"
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "(사용자에게 업로드 권한도 있는지 확인하십시오)"
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr "허용된 업로드 파일 형식"
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr "익명 탐색 활성화"
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr "공개 등록 활성화"
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr "이메일을 사용자 이름으로 사용"
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr "Enable Magic Link Remote Login"
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr "Kobo sync 활성화"
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Kobo Store에 알 수 없는 요청 프록시"
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "서버 외부 포트(포트 전달 API 호출용)"
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Goodreads 사용"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "API 키 생성"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Goodreads API Key"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr "역방향 프록시 인증 허용"
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "로그인 유형"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr "표준 인증 사용"
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr "LDAP 인증 사용"
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr "OAuth 사용"
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr "LDAP 서버 호스트 이름 또는 IP 주소"
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr "LDAP 서버 포트"
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr "LDAP 암호화"
+
+#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
+#: cps/templates/email_edit.html:41
+msgid "None"
+msgstr "None"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP CACertificate 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 인증서 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 키 파일 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr "LDAP 인증"
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr "익명"
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr "인증되지 않음"
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr "Simple"
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr "LDAP 관리자 사용자 이름"
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr "LDAP 관리자 비밀번호"
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP 고유 이름(DN)"
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr "LDAP 사용자 개체 필터"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr "LDAP 서버는 OpenLDAP입니까?"
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr "사용자 가져오기에는 다음 설정이 필요합니다."
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr "LDAP 그룹 개체 필터"
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr "DAP 그룹 이름"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr "LDAP 그룹 구성원 필드"
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr "LDAP 구성원 사용자 필터 감지"
+
+#: cps/templates/config_edit.html:280
+msgid "Autodetect"
+msgstr "자동 감지"
+
+#: cps/templates/config_edit.html:281
+msgid "Custom Filter"
+msgstr "맞춤 필터"
+
+#: cps/templates/config_edit.html:286
+msgid "LDAP Member User Filter"
+msgstr "LDAP 구성원 사용자 필터"
+
+#: cps/templates/config_edit.html:297
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "%(provider)s OAuth 자격 증명 얻기"
+
+#: cps/templates/config_edit.html:300
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "%(provider)s OAuth 클라이언트 ID"
+
+#: cps/templates/config_edit.html:304
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 클라이언트 암호"
+
+#: cps/templates/config_edit.html:320
+msgid "External binaries"
+msgstr "외부 바이너리"
+
+#: cps/templates/config_edit.html:326
+msgid "Path to Calibre E-Book Converter"
+msgstr "Calibre E-Book 변환기 경로"
+
+#: cps/templates/config_edit.html:334
+msgid "Calibre E-Book Converter Settings"
+msgstr "Calibre E-Book 변환기 경로 설정"
+
+#: cps/templates/config_edit.html:337
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Kepubify 전자책 변환기 경로"
+
+#: cps/templates/config_edit.html:345
+msgid "Location of Unrar binary"
+msgstr "Unrar 바이너리의 위치"
+
+#: cps/templates/config_view_edit.html:17
+msgid "View Configuration"
+msgstr "환경 설정 보기"
+
+#: cps/templates/config_view_edit.html:32
+msgid "No. of Random Books to Display"
+msgstr "랜덤 보기시 표시할 책 수"
+
+#: cps/templates/config_view_edit.html:36
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "숨기기 전에 표시할 저자 수(0=숨기기 비활성화)"
+
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+msgid "Theme"
+msgstr "테마"
+
+#: cps/templates/config_view_edit.html:42
+msgid "Standard Theme"
+msgstr "기본 테마"
+
+#: cps/templates/config_view_edit.html:43
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! 다크 모드"
+
+#: cps/templates/config_view_edit.html:47
+msgid "Regular Expression for Ignoring Columns"
+msgstr "열을 무시하는 정규식"
+
+#: cps/templates/config_view_edit.html:51
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "읽음/읽지 않음 상태를 Calibre 열에 연결"
+
+#: cps/templates/config_view_edit.html:60
+msgid "View Restrictions based on Calibre column"
+msgstr "Calibre 열을 기반으로 한 보기 제한"
+
+#: cps/templates/config_view_edit.html:69
+msgid "Regular Expression for Title Sorting"
+msgstr "제목 정렬을 위한 정규식"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
+msgstr "새 사용자를 위한 기본 설정"
+
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
+msgid "Admin User"
+msgstr "관리자"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
+msgid "Allow Downloads"
+msgstr "다운로드 허용"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
+msgid "Allow eBook Viewer"
+msgstr "책 보기 허용"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
+msgid "Allow Uploads"
+msgstr "업로드 허용"
+
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
+msgid "Allow Edit"
+msgstr "편집 허용"
+
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
+msgid "Allow Delete Books"
+msgstr "책 삭제 허용"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
+msgid "Allow Changing Password"
+msgstr "비밀번호 변경 허용"
+
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
+msgid "Allow Editing Public Shelves"
+msgstr "공개 서재 편집 허용"
+
+#: cps/templates/config_view_edit.html:123
+msgid "Default Language"
+msgstr "기본 언어"
+
+#: cps/templates/config_view_edit.html:131
+msgid "Default Visible Language of Books"
+msgstr "책의 기본 표시 언어"
+
+#: cps/templates/config_view_edit.html:147
+msgid "Default Visibilities for New Users"
+msgstr "신규 사용자를 위한 기본 기능"
+
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
+#: cps/templates/user_table.html:154
+msgid "Show Random Books in Detail View"
+msgstr "상세 보기에서 임의의 책 표시"
+
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+msgid "Add Allowed/Denied Tags"
+msgstr "허용/거부 태그 추가"
+
+#: cps/templates/config_view_edit.html:166
+msgid "Add Allowed/Denied custom column values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/detail.html:60 cps/templates/detail.html:69
+msgid "Read in Browser"
+msgstr "부라우저에서 보기"
+
+#: cps/templates/detail.html:77 cps/templates/detail.html:94
+msgid "Listen in Browser"
+msgstr "브라우저에서 듣기"
+
+#: cps/templates/detail.html:124
+#, python-format
+msgid "Book %(index)s of %(range)s"
+msgstr "책 %(index)s의 %(range)s"
+
+#: cps/templates/detail.html:173
+msgid "Published"
+msgstr "출간일"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Unread"
+msgstr "읽지 않은 상태로 표시"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Read"
+msgstr "읽은 상태로 표시"
+
+#: cps/templates/detail.html:222
+msgid "Read"
+msgstr "읽기"
+
+#: cps/templates/detail.html:231
+msgid "Restore from archive"
+msgstr "아카이브에서 복원"
+
+#: cps/templates/detail.html:231
+msgid "Add to archive"
+msgstr "아카이브에 추가"
+
+#: cps/templates/detail.html:232
+msgid "Archived"
+msgstr "보관됨"
+
+#: cps/templates/detail.html:243
+msgid "Description:"
+msgstr "설명:"
+
+#: cps/templates/detail.html:256 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "서재에 추가"
+
+#: cps/templates/detail.html:267 cps/templates/detail.html:284
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
+#: cps/templates/search.html:20
+msgid "(Public)"
+msgstr "(공개)"
+
+#: cps/templates/detail.html:298
+msgid "Edit Metadata"
+msgstr "메타저오 편집"
+
+#: cps/templates/email_edit.html:13
+msgid "Choose Server Type"
+msgstr "서버 유형 선택"
+
+#: cps/templates/email_edit.html:15
+msgid "Use Standard E-Mail Account"
+msgstr "표준 이메일 계정 사용"
+
+#: cps/templates/email_edit.html:16
+msgid "Gmail Account with OAuth2 Verification"
+msgstr "OAuth2 인증이 있는 Gmail 계정"
+
+#: cps/templates/email_edit.html:22
+msgid "Setup Gmail Account as E-Mail Server"
+msgstr "Gmail 계정을 이메일 서버로 설정"
+
+#: cps/templates/email_edit.html:24
+msgid "Revoke Gmail Access"
+msgstr "Gmail 액세스 취소"
+
+#: cps/templates/email_edit.html:42
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:43
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:51
+msgid "SMTP Password"
+msgstr "SMTP 비밀번호"
+
+#: cps/templates/email_edit.html:58
+msgid "Attachment Size Limit"
+msgstr "첨부 파일 크기 제한"
+
+#: cps/templates/email_edit.html:66
+msgid "Save and Send Test E-mail"
+msgstr "저장 후 테스트 이메일 보내기"
+
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
+msgid "Back"
+msgstr "뒤로"
+
+#: cps/templates/email_edit.html:74
+msgid "Allowed Domains (Whitelist)"
+msgstr "허용하는 도메인(화이트 리스트)"
+
+#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
+msgid "Add Domain"
+msgstr "도메인 추가"
+
+#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
+#: cps/templates/user_table.html:27
+msgid "Add"
+msgstr "추가"
+
+#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
+msgid "Enter domainname"
+msgstr "도메인 입력"
+
+#: cps/templates/email_edit.html:92
+msgid "Denied Domains (Blacklist)"
+msgstr "거부 도메인(블랙리스트)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+msgid "Next"
+msgstr "다음"
+
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집)합니다."
+
+#: cps/templates/http_error.html:31
+msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
+msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의하십시오."
+
+#: cps/templates/http_error.html:41
+msgid "Create Issue"
+msgstr "이슈 생성"
+
+#: cps/templates/http_error.html:48
+msgid "Return to Home"
+msgstr "홈으로"
+
+#: cps/templates/http_error.html:50
+msgid "Logout User"
+msgstr "로그아웃"
+
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr "다운로드 횟수에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr "다운로드 횟수에 따라 내림차순 정렬"
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/shelf.html:23
+msgid "Sort authors in alphabetical order"
+msgstr "저자를 가나다순(알파벳순)으로 정렬"
+
+#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/shelf.html:24
+msgid "Sort authors in reverse alphabetical order"
+msgstr "저자를 가나다(알파벳) 역순으로 정렬"
+
+#: cps/templates/index.html:81
+msgid "Sort ascending according to series index"
+msgstr "시리즈 인덱스에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:82
+msgid "Sort descending according to series index"
+msgstr "시리즈 인덱스에 따라 내림차순 정렬"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "시작"
+
+#: cps/templates/index.xml:18
+msgid "Alphabetical Books"
+msgstr "가나다(알파벳) 순"
+
+#: cps/templates/index.xml:22
+msgid "Books sorted alphabetically"
+msgstr "가나다(알파벳)순으로 정렬한 책"
+
+#: cps/templates/index.xml:29
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "다운로드 기준 인기 도서."
+
+#: cps/templates/index.xml:36
+msgid "Popular publications from this catalog based on Rating."
+msgstr "별점 기준 인기 도서"
+
+#: cps/templates/index.xml:39
+msgid "Recently added Books"
+msgstr "최근 추가된 도서"
+
+#: cps/templates/index.xml:43
+msgid "The latest Books"
+msgstr "최신 도서"
+
+#: cps/templates/index.xml:46
+msgid "Random Books"
+msgstr "랜덤 정렬"
+
+#: cps/templates/index.xml:73
+msgid "Books ordered by Author"
+msgstr "저자별 정렬"
+
+#: cps/templates/index.xml:80
+msgid "Books ordered by publisher"
+msgstr "출판사별 정렬"
+
+#: cps/templates/index.xml:87
+msgid "Books ordered by category"
+msgstr "카테고리별 정렬"
+
+#: cps/templates/index.xml:94
+msgid "Books ordered by series"
+msgstr "시리즈별 정렬"
+
+#: cps/templates/index.xml:101
+msgid "Books ordered by Languages"
+msgstr "언어별 정렬"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by Rating"
+msgstr "평점별 정렬"
+
+#: cps/templates/index.xml:116
+msgid "Books ordered by file formats"
+msgstr "파일 종류별 정렬"
+
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/search_form.html:87
+msgid "Shelves"
+msgstr "서재"
+
+#: cps/templates/index.xml:123
+msgid "Books organized in shelves"
+msgstr "서재별 정렬"
+
+#: cps/templates/layout.html:29
+msgid "Home"
+msgstr "홈"
+
+#: cps/templates/layout.html:35
+msgid "Toggle Navigation"
+msgstr "탐색 활성화"
+
+#: cps/templates/layout.html:46
+msgid "Search Library"
+msgstr "검색"
+
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
+msgid "Uploading..."
+msgstr "업로드 중..."
+
+#: cps/templates/layout.html:63
+msgid "Error"
+msgstr "오류"
+
+#: cps/templates/layout.html:63
+msgid "Upload done, processing, please wait..."
+msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
+
+#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+msgid "Settings"
+msgstr "설정"
+
+#: cps/templates/layout.html:78
+msgid "Account"
+msgstr "계정"
+
+#: cps/templates/layout.html:80
+msgid "Logout"
+msgstr "로그아웃"
+
+#: cps/templates/layout.html:118
+msgid "Please do not refresh the page"
+msgstr "페이지를 새로고침 하지 마세요."
+
+#: cps/templates/layout.html:128
+msgid "Browse"
+msgstr "탐색"
+
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
+msgid "About"
+msgstr "서재 정보"
+
+#: cps/templates/layout.html:155
+msgid "Previous"
+msgstr "이전"
+
+#: cps/templates/layout.html:182
+msgid "Book Details"
+msgstr "책 상세정보"
+
+#: cps/templates/login.html:18
+msgid "Remember Me"
+msgstr "로그인 유지"
+
+#: cps/templates/login.html:23
+msgid "Forgot Password?"
+msgstr "비밀번호를 잊으셨나요? "
+
+#: cps/templates/login.html:26
+msgid "Log in with Magic Link"
+msgstr "Magic Link로 로그인"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web Log: "
+msgstr "Calibre-Web 로그 표시:"
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web Log: "
+msgstr "Calibre-Web 로그:"
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr "스트림 출력, 표시할 수 없음"
+
+#: cps/templates/logviewer.html:12
+msgid "Show Access Log: "
+msgstr "액세스 로그 표시:"
+
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Calibre-Web 로그 다운로드"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Access Log 다운로드"
+
+#: cps/templates/modal_dialogs.html:6
+msgid "Select Allowed/Denied Tags"
+msgstr "허용/거부 태그 선택"
+
+#: cps/templates/modal_dialogs.html:7
+msgid "Select Allowed/Denied Custom Column Values"
+msgstr "허용/거부 사용자 정의 열 값 선택"
+
+#: cps/templates/modal_dialogs.html:8
+msgid "Select Allowed/Denied Tags of User"
+msgstr "사용자의 허용/거부 태그 선택"
+
+#: cps/templates/modal_dialogs.html:9
+msgid "Select Allowed/Denied Custom Column Values of User"
+msgstr "사용자의 사용자 정의 열 값 허용/거부 선택"
+
+#: cps/templates/modal_dialogs.html:15
+msgid "Enter Tag"
+msgstr "태그 입력"
+
+#: cps/templates/modal_dialogs.html:24
+msgid "Add View Restriction"
+msgstr "보기 제한 추가"
+
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "이 책 형식은 데이터베이스에서 영구적으로 삭제됩니다."
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "이 책은 데이터베이스에서 영구적으로 삭제됩니다."
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "그리고 하드디스크"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Kobo 참고 사항: 삭제된 책은 페어링된 모든 Kobo 기기에 남아 있습니다."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "책을 안전하게 삭제하려면 먼저 책을 보관하고 기기를 동기화해야 합니다."
+
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr "파일 위치 선택"
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr "유형"
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr "이름"
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr "크기"
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr "상위 폴더"
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr "선택"
+
+#: cps/templates/modal_dialogs.html:134
+msgid "Ok"
+msgstr "Ok"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr "Calibre-Web 책 목록"
+
+#: cps/templates/read.html:6
+msgid "epub Reader"
+msgstr "EPUB 리더"
+
+#: cps/templates/read.html:75
+msgid "Reflow text when sidebars are open."
+msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
+
+#: cps/templates/readcbr.html:7
+msgid "Comic Reader"
+msgstr "코믹 리더"
+
+#: cps/templates/readcbr.html:89
+msgid "Keyboard Shortcuts"
+msgstr "키보드 단축키"
+
+#: cps/templates/readcbr.html:92
+msgid "Previous Page"
+msgstr "이전 페이지"
+
+#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+msgid "Next Page"
+msgstr "다음 페이지"
+
+#: cps/templates/readcbr.html:94
+msgid "Scale to Best"
+msgstr "최적 크기"
+
+#: cps/templates/readcbr.html:95
+msgid "Scale to Width"
+msgstr "폭 조절"
+
+#: cps/templates/readcbr.html:96
+msgid "Scale to Height"
+msgstr "높이 조절"
+
+#: cps/templates/readcbr.html:97
+msgid "Scale to Native"
+msgstr "기본 크기"
+
+#: cps/templates/readcbr.html:98
+msgid "Rotate Right"
+msgstr "오른쪽으로 회전"
+
+#: cps/templates/readcbr.html:99
+msgid "Rotate Left"
+msgstr "왼쪽으로 회전"
+
+#: cps/templates/readcbr.html:100
+msgid "Flip Image"
+msgstr "이미지 뒤집기"
+
+#: cps/templates/readcbr.html:116
+msgid "Light"
+msgstr "밝게"
+
+#: cps/templates/readcbr.html:117
+msgid "Dark"
+msgstr "어둡게"
+
+#: cps/templates/readcbr.html:122
+msgid "Scale"
+msgstr "크기"
+
+#: cps/templates/readcbr.html:125
+msgid "Best"
+msgstr "최적"
+
+#: cps/templates/readcbr.html:126
+msgid "Width"
+msgstr "폭"
+
+#: cps/templates/readcbr.html:127
+msgid "Height"
+msgstr "높이"
+
+#: cps/templates/readcbr.html:128
+msgid "Native"
+msgstr "기본"
+
+#: cps/templates/readcbr.html:133
+msgid "Rotate"
+msgstr "회전"
+
+#: cps/templates/readcbr.html:144
+msgid "Flip"
+msgstr "뒤집기"
+
+#: cps/templates/readcbr.html:147
+msgid "Horizontal"
+msgstr "수평"
+
+#: cps/templates/readcbr.html:148
+msgid "Vertical"
+msgstr "수직"
+
+#: cps/templates/readcbr.html:153
+msgid "Direction"
+msgstr "방향"
+
+#: cps/templates/readcbr.html:156
+msgid "Left to Right"
+msgstr "왼쪽에서 오른쪽"
+
+#: cps/templates/readcbr.html:157
+msgid "Right to Left"
+msgstr "오른쪽에서 왼쪽"
+
+#: cps/templates/readcbr.html:165
+msgid "Reset to Top"
+msgstr "맨 위로 재설정"
+
+#: cps/templates/readcbr.html:166
+msgid "Remember Position"
+msgstr "위치 기억"
+
+#: cps/templates/readcbr.html:171
+msgid "Scrollbar"
+msgstr "스크롤바"
+
+#: cps/templates/readcbr.html:174
+msgid "Show"
+msgstr "보기"
+
+#: cps/templates/readcbr.html:175
+msgid "Hide"
+msgstr "숨기기"
+
+#: cps/templates/readdjvu.html:5
+msgid "DJVU Reader"
+msgstr "DJVU 리더"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF Reader"
+msgstr "PDF 리더"
+
+#: cps/templates/readtxt.html:6
+msgid "txt Reader"
+msgstr "텍스트 리더"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "새 계정 등록"
+
+#: cps/templates/register.html:10
+msgid "Choose a username"
+msgstr "사용자 이름 선택"
+
+#: cps/templates/register.html:15
+msgid "Your email address"
+msgstr "이메일 주소"
+
+#: cps/templates/remote_login.html:5
+msgid "Magic Link - Authorise New Device"
+msgstr "Magic Link - 새 장치 승인"
+
+#: cps/templates/remote_login.html:7
+msgid "On another device, login and visit:"
+msgstr "다른 기기에서 로그인하고 방문하세요."
+
+#: cps/templates/remote_login.html:11
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
+
+#: cps/templates/remote_login.html:14
+msgid "This verification link will expire in 10 minutes."
+msgstr "이 확인 링크는 10분 후에 만료됩니다."
+
+#: cps/templates/search.html:5
+msgid "No Results Found"
+msgstr "결과가 없습니다."
+
+#: cps/templates/search.html:6
+msgid "Search Term:"
+msgstr "검색어: "
+
+#: cps/templates/search.html:8
+msgid "Results for:"
+msgstr "결과:"
+
+#: cps/templates/search_form.html:21
+msgid "Published Date From"
+msgstr "출간일(부터)"
+
+#: cps/templates/search_form.html:31
+msgid "Published Date To"
+msgstr "출간일(까지)"
+
+#: cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "읽은 상태"
+
+#: cps/templates/search_form.html:59
+msgid "Exclude Tags"
+msgstr "태그 제외"
+
+#: cps/templates/search_form.html:77
+msgid "Exclude Series"
+msgstr "시리즈 제외"
+
+#: cps/templates/search_form.html:95
+msgid "Exclude Shelves"
+msgstr "서재 제외"
+
+#: cps/templates/search_form.html:115
+msgid "Exclude Languages"
+msgstr "언어 제외"
+
+#: cps/templates/search_form.html:126
+msgid "Extensions"
+msgstr "확장자"
+
+#: cps/templates/search_form.html:134
+msgid "Exclude Extensions"
+msgstr "확장자 제외"
+
+#: cps/templates/search_form.html:144
+msgid "Rating Above"
+msgstr "평점(이상)"
+
+#: cps/templates/search_form.html:148
+msgid "Rating Below"
+msgstr "평점(이하)"
+
+#: cps/templates/search_form.html:180
+msgid "From:"
+msgstr "부터:"
+
+#: cps/templates/search_form.html:190
+msgid "To:"
+msgstr "까지:"
+
+#: cps/templates/shelf.html:12
+msgid "Delete this Shelf"
+msgstr "이 서재 삭제"
+
+#: cps/templates/shelf.html:13
+msgid "Edit Shelf Properties"
+msgstr "서재 속성 편집"
+
+#: cps/templates/shelf.html:16
+msgid "Arrange books manually"
+msgstr "수동으로 책 정렬"
+
+#: cps/templates/shelf.html:17
+msgid "Disable Change order"
+msgstr "정렬 변경 비활성화"
+
+#: cps/templates/shelf.html:17
+msgid "Enable Change order"
+msgstr "정렬 변경 활성화"
+
+#: cps/templates/shelf_edit.html:14
+msgid "Share with Everyone"
+msgstr "모두와 공유"
+
+#: cps/templates/shelf_edit.html:21
+msgid "Sync this shelf with Kobo device"
+msgstr "이 서재를 Kobo 기기와 동기화"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "드래그하여 순서 변경"
+
+#: cps/templates/shelf_order.html:33
+msgid "Hidden Book"
+msgstr "숨겨진 책"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Calibre 서재 통계"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "이 서재의 책들"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "이 서재의 저자"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "이 서재의 카테고리"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "이 서재의 시리즈"
+
+#: cps/templates/stats.html:29
+msgid "System Statistics"
+msgstr "시스템 통계"
+
+#: cps/templates/stats.html:33
+msgid "Program Library"
+msgstr "서재 프로그램"
+
+#: cps/templates/stats.html:34
+msgid "Installed Version"
+msgstr "설치 버전"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "사용자"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "작업"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "상태"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "Progress"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "실행 시간"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "시작 시간"
+
+#: cps/templates/user_edit.html:20
+msgid "Reset user Password"
+msgstr "사용자 비밀번호 초기화"
+
+#: cps/templates/user_edit.html:43
+msgid "Language of Books"
+msgstr "책 언어"
+
+#: cps/templates/user_edit.html:54
+msgid "OAuth Settings"
+msgstr "OAuth 설정"
+
+#: cps/templates/user_edit.html:56
+msgid "Link"
+msgstr "링크"
+
+#: cps/templates/user_edit.html:58
+msgid "Unlink"
+msgstr "링크 해제"
+
+#: cps/templates/user_edit.html:64
+msgid "Kobo Sync Token"
+msgstr "코보 연동 토큰"
+
+#: cps/templates/user_edit.html:66
+msgid "Create/View"
+msgstr "생성/보기"
+
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr "강제로 코보 전체 동기화"
+
+#: cps/templates/user_edit.html:88
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/user_edit.html:137
+msgid "Sync only books in selected shelves with Kobo"
+msgstr "선택한 서가에 있는 책만 Kobo와 동기화"
+
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
+msgid "Delete User"
+msgstr "사용자 삭제"
+
+#: cps/templates/user_edit.html:159
+msgid "Generate Kobo Auth URL"
+msgstr "Kobo Auth URL 생성"
+
+#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
+msgid "Select..."
+msgstr "선택..."
+
+#: cps/templates/user_table.html:131
+msgid "Edit User"
+msgstr "사용자 편집"
+
+#: cps/templates/user_table.html:134
+msgid "Enter Username"
+msgstr "사용자 이름"
+
+#: cps/templates/user_table.html:135
+msgid "Enter E-mail Address"
+msgstr "이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Enter Kindle E-mail Address"
+msgstr "킨들 이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Kindle E-mail"
+msgstr "킨들 이메일"
+
+#: cps/templates/user_table.html:137
+msgid "Locale"
+msgstr "언어"
+
+#: cps/templates/user_table.html:138
+msgid "Visible Book Languages"
+msgstr "표시할 책 언어"
+
+#: cps/templates/user_table.html:139
+msgid "Edit Allowed Tags"
+msgstr "허용된 태그 편집"
+
+#: cps/templates/user_table.html:139
+msgid "Allowed Tags"
+msgstr "허용된 태그"
+
+#: cps/templates/user_table.html:140
+msgid "Edit Denied Tags"
+msgstr "거부된 태그 편집"
+
+#: cps/templates/user_table.html:140
+msgid "Denied Tags"
+msgstr "거부된 태그"
+
+#: cps/templates/user_table.html:141
+msgid "Edit Allowed Column Values"
+msgstr "허용된 열 값 편집"
+
+#: cps/templates/user_table.html:141
+msgid "Allowed Column Values"
+msgstr "허용되는 열 값"
+
+#: cps/templates/user_table.html:142
+msgid "Edit Denied Column Values"
+msgstr "거부된 열 값 편집"
+
+#: cps/templates/user_table.html:142
+msgid "Denied Column Values"
+msgstr "거부된 열 값"
+
+#: cps/templates/user_table.html:144
+msgid "Change Password"
+msgstr "비밀번호 변경"
+
+#: cps/templates/user_table.html:147
+msgid "View"
+msgstr "보기"
+
+#: cps/templates/user_table.html:150
+msgid "Edit Public Shelves"
+msgstr "공개 서재 편집"
+
+#: cps/templates/user_table.html:152
+msgid "Sync selected Shelves with Kobo"
+msgstr "선택한 서재를 코보와 동기화"
+
+#: cps/templates/user_table.html:156
+msgid "Show read/unread selection"
+msgstr "읽음/읽지 않음 선택 표시"
+
+#: cps/templates/user_table.html:159
+msgid "Show random books"
+msgstr "랜덤 보기 표시"
+
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index d7e7c45ee39325b7c028cb75a234a08734bb2334..51c56591730f98d589a25bf5d31a0f99fefc6dd7 100644
GIT binary patch
delta 11273
zcmYM&2Xt0N`p5B08X>)rO2`X=gb)%ELIMdO0YVTGid3aZlO}(q2m}-^h!Rmkz(^4k
zM7l}`L(`>LmM*$3!mdcMEr=i%KwaGLkC}7+d(NKE%)Ix`Jo7v=H|!pI(ff;e-tL76
zpT!RUsrGW5I{1&;>iz$J=BGPOHr)zL#=l_`yn=c@j7|h*p!$XA!9my*XQDrD!9G}x
zeK9!0aq=C<bw<!=$-qkV#k1HJzr>oDnCUp)*brkd4O6il2H+SB!KW|?=U@~rL_N38
zj-SL3`sZ!`Kj_Q)&Tlj{(Vy0ugdIXZ0z<JLDu8TMfVrqZTA_B{3qx@vYMv>mOw7jm
zxDtc$5bF8Us3c#;1lD)%&`{)2S&kEr^-vGC#%9<ZYvHqYd_F3rt5AV%MD4g5OYj5^
z##riBic^tlIUis>yom}dg2~-z8o4wmi&Kh<Y#PR4CHmne48(01h6hlkIf=@|=ct`u
zM<2X{k@#QR56>|hj7AUR$*B2@a>&149L#`fH3k*wB4iWJd#J#E!~#rc?l^ha7gdT1
z)caM)adB2+8lFIH<TvbxLAfT-5vUA5WBW^U$-g4m%0MC>wGVt}AMj!|y%3K|buK1g
z5jMmjs0__TJy(HB@kVTf$FKqZjNusD!u;MCwQi|PBZkIE9Evk-{~~JQJE&{-7iy=;
zToo;pi4oWt^Kl?*;U%aN?ZGHKihAw>DuAD`9eVSUGV6Avp;S&pozgNSYtCHMMEjBR
z;+()ByoZ`Nu)sX;L7k0E?0^NRQqDvjvh}Fja1<5Dx7Zr*BJ;UUUMrK@4yXuwq9z=H
zp*SA(J(z_G@E~#=oKqNyUd*OL7mZ1nfbrN0>tbJ2Ad^uUU51)})qSb|+cdOLH7bCQ
zQMEgVozbg}nXnY~;waRDlWe~Xm6_*Iw_*|My1t6a)Ed-v-GecB2$lMCn8x~!-vcIP
zS*QmeM(u1U#^Pj*#s#R7tiw9^E^4Qrp%(lRwZI+JVGSc~DoGNmKO8mBL`=eY=+>pN
ziH5Gt-%*F?7HWr4g=T>`RA!o^0xCuY@+c<YcvNZTqXJ)!wQ-B}15|+LQD@+5RK{)>
zQh!bC!;y@`Xw(E*s0E5p0ro-d^eNO%Dp9v#CF=c6r~vk(-aCp){drV?H&7)GY;S%~
zKn2jGy=x-NXF#>>U?1p?T4;#vKZ&{}vrs9Xi@GH%Q7Qcl$+~mZnnvCgz-VlSGf*4c
zhRVP(RN!B_G_=qSR7CeM5d(|N4%1LOYmR!MJ?a$qMqRT3n1ORJ2e)GqeuF9K+tJtr
zHE%EL1XO0-N*dj1Y(drR9(Kj3ViVXf)It+bJAD<k;5Ot@=K?mw2Axc1x}Y{P3>EN`
z*cfM{4);6ggS(Luy3Rftn(#wZ?S4kSzK+j>rX&UEOTQR{u@n_Zf7C6QfT_5^j=zfv
z=p?4#&!~ChJDY&gQKe~v39Rq*q|u9kCr}d|MlEpl{sWFvql-CwiPo0Lx5w#)0a%HC
zxEytcR-<;f*}4M*=vQMcJd8S&Coq)to$qNV!aJx5YL%G7R2!AT-bgIYNDRPjc6>jo
zWG7K)=nCrg+(I2Tzfx0k52_>&pbl?|?GHz{0R!V{=u|GombejX;w4nd|ASiiHtHIA
zbu~MPux6qb?t-lC490%=7AkPBZl+YFsQ1U9z9ZARk$(-mYzN*%U6=jHm34kZ9kMJ=
zs3M<&^>6`Z<2EeB%b1MGJxnG$p%!=;_1*;3^YgF}_oF}l*@OHm#l8=j48)*n)EI-Y
zxgBqhI)r^twH<(II0RM87cm^yqcXJzbtaA=pLypP>dg4}G?^$u1vu2Dp#`U-4&8I8
znyx^VVmpT5Ra5|Xu_^wATBs=}R|^$jAhttgs4HscPhvQhV-UWInr}U7K6f__U5EXs
zL-PshLva;#2K;-Q1;Q|$ehexD9Z-Qkh<dIkdSQQ5fP*j$D^S;TC2C{)u`!;(EZzS<
zX?PgO=)>0yyCMHJa2BDyP$y6eUPJBZCTa)%ea(U~s6!l&Is<J{^9;vKT#riq=Sb3=
z@P6h?IRZQD{x74!Z_Z_m#QcX%<XusRWH5Sgl=THviZ`JGIgZWnJhsE&M@%5yksUgd
ztZOlY{^zKTdH1KU`(K}i4p9#*#&KAHJFx}+h{{09025F;-anie%6NNgPy72YR7M_0
zZD=8?_G?ik+l~r+Ke~G07!4hg3#gjiwEY?b%?pvJ=MqteE*rIQYt+Q0s6+S&M&S_a
zWc&Mz)}<KB?`u(K=DmUBUlV-DfOhyPYJsz;(|j5A!jGs0YYs9C#9%!ACbr)RRr`Uc
zlFhQ?^H9&N#1!0%sdy2UA^*YTUkhanHW|oA?WDx^dm?{7oDtXwH=_di730wNQImlr
zREC<Mc2<bW#Dn(tL8z3EMZGr-^?a2}Lkn)O16xqFJ#5E6K?Qggm8mPJ9o|GecNdkh
znnO%K0##!VdSheE$4o51(Wn5|pyqMkrlHjDLPfS0^<nr7wZJ*lj=!_sM(w2LP_s}p
zY6BkBcq%H;Jk<Lg?C%eu?)}54+cF0!jqAKiqdo&?P?7(F3gjMY!q{QvgOrL|s3YpR
zQq)3yF&c-X4)JtU>gQt)u100>b5zYQp?2;!TpuQv-O<nwO;9y?2xIUu>kQPyi&3fD
zfXdibJH87w;YX-Uokj)p71qYzP#XyvVdhCd5B&^`VtuC@4J|wz^}<wC02P>k>umoJ
z>NcE11#}Cwkk4ag#|cPEoh;PvC8+rZp)xQD@7Ela$rsQ~qftpi?!~5f#Tq%%{4b#n
zSfBB6s2WzHp5KQa{2Cjf?<g~ICMxy0wm$}yf$`{zF6z)eKZ^X<q_NNrEJHu~Yf!0t
z3+v%NY>5BH4D=dp{*{}B9{N2{JDz~vI0tq3%FzcGTbH8(ScS^Sy3ypn3ytjz=*#yf
zK7hev%!8#ELBA*JTmBeoXG>72KZd$qmr$oVVXVneH>^v48fN1%)CP{B0=S6*_?t^Z
z5!ZO!?7-I=gUUdfH6ImVXWQ?O3TQ0W#1*I%ud%=HKxOhU>P#HPMEn|cro6_P+vC=y
zp+l99dZ7qCSb~~x946t@w!Z?k)3>k@eu;X|@Bhr-`CwG)8)GWA#NIdrgK#%0;KN7;
zUFR5$U<NLsYIp;6`fEI4?s*(4;$&-ER80q<o*QB<vo6FC#y6rrR-;mW5S4+CPyu{>
z|99&D0}W01D=L8BQMCzr(*BzeYte6vY1kZ9`@yJ*CZiUZflBopR7qE&GV~^<;BnMh
zx`o=X?|6IvBWdUmHA4L`47K2RRAAFF1YP_40#wRh!!TTfdTy6>FDiidQ2`uAW#Sqt
z1HV`!CNSswH8@B#TJgh;iRMtHPcr}Ob|9+ui%^-_j&<+|dhjCVV2!6t#&VHAj836-
z6&BLJhpn;gWb@oJSWLfsvc3PO7|@RYiOF~o^U!CC*<mYGtxGWyN1#$&hIv?J$B$uc
z`WH}tLw-SJDrBmer#33XDc0swslRH{o&nXc4=PmyP&*xg%D`;YbE{FA*o95-BW!>_
zV;IJknE=u-hJIVr@BL7LKZE*`F0}ofE{!|}K1Lm;d#DBcrkU#!i&69&q5>$u0oWC(
zma_@_W1Z>d--=T)oBmeJ#7n4}hdpgdoQe7{jYS3M&ZD6et;SH?h}y{>R6s{D0ncDG
zUPqP6=NS`d2r6?P)csCDEtrFP{vp)!qfvoPw64W`-T!~mXvGg<Gt57=O0gUL#i+o(
z#z4G=E$}ur$EGvQ85n`j(RWdS`cTq1^q>a|P&*!gD#dh6#8nv2`p$d&w;=;xU@YE4
zJrFa?{uM**U<~T_Nmvi(qt3t<Y>fXx{q8s09O5L@JRML04MnQ!JZ*pf1#7XE6Z@>W
zr}a@OEI|)Gj5;*aunksVQ#_7J?H{PK5i!S<EEQGLme>V*-~+e<Rm$_I`7dK@yn(K2
z-h}*Vf!3(nPe<+KCEH(%I+VMy6hB6lAnJK@$U38TT86rQORz1zgPQ*b)cb#;0uGsL
z`pI+2zrJj_47A50Q~>3u!?FxLcntmU8rH{KsFc<&HzjC_D#1Y1St&=&Q-um>t#u#P
zq5lbH;q`Lz|0s>RFPOtI6BY3q^v9j3lpR2QIF4dXJd6JL6{h0%s8WT^GvA8_m_ok@
zlksuXbCno?)u>Dyc4;WpXHhA<iMr<@FPfd#L#3`g*23PX$Ooe`SBb^A61DShP-oyL
z%)nYNnT@qTeP;%u0;)o7z^$g?p>YtEnoFpF?pb5zn`@SZN@WQu(4pu-7qzoDP=Wv5
z{{AmiAa_ykg;$vOQc;=dh-}Pt#?jE1Y9@McGb%NwP&>YYy1&;^r3qSKey@W{c{avl
zM-0XxsEj>f`?D~R{sIiZ<){s;!)V?ABQzBGdGx{Ss0nXjE(TYcz&c=8`Xj76Pysj#
z&0&o~y;qFdz)%dsDX5H=qXK&amFXRL|Nft*p~%mnCj1U{$o@dxQ}0FQbQfX){l~EZ
zuE%sdZoQ3~IQeB`Au6CjI2g-N^Pj~ocnw`enpb7+a|!B&Sy+TCQ1|#EHbu`X<`dfk
z!|0Dg)piEz6JCWnRHsp;`vRlzGIqk-w%>NK*;wzz<X<&e#DG%&8Y&a3QD3;NsBij5
zn2DEBI}Bf9GLUKQg$k$)YvVlB!mCiJ--Vs=Bx;_RrDmSurPN>7VK@Ui6y>N4tV5;f
zAZjOp%ghI;HipozgDO!v>Tu;)+oA#~LCrf5BXAZfpehW-jo1_SxHPn2;H#WmOhGMB
zj?uUTHNj@oiw7|VKfzf19<}2d%T4BDFo}LcR3IHO4f~=3orU>0AGI;}BN|HiC#Z!l
zpccB0%E*6F3nr{Ef#hH*{bC%3RjAtjhAPbiubFuUpmsdg_FYuK3$PV#K+c%!T%n;<
zH+tQC(<h<6@fFw_x1kQ>b@X7fmF61tLQVJ>D!`f85|>~HJdHY2k*myxVo@7xgud7U
z!*&1L&`4sSJL-ogQKxt^=HN_B!X2oEK1G$}D*EAnQJ-L+H;g5iME_+>z#XVmpF)j)
zfkAi&JGwM{SKC8_T6iF8=Z~Ro$D4M1Ge**X7c=mf?cYJwI_OQ4@<i0xX@;tKXY^nn
zOvEXuKwd#t3+|$!h~C3oJcb%~)|k}QLS-fny)g;%Fd0>X{+NuD(1S}+0q()h_$}7Q
zthMG--V58&pSYI%C)3!)fNJ#x#^aZ$6yLGqf$Pi%C=4}mAr{~h*c>-u5njMYFnPWC
zx8e-!O@B8&g#jDP{4R#mU%r9-E5+|HkcrjU5WmF~4BBW?n}a%BMW`LkKo5S5%Gmd)
z!0T=@0p_D>KMJ+eIjGWoh#ov=$A5QebYP(MTPDS`(2xFH)U~WYWnu;DI&HyPcmx~c
zNjrYW8vM2?Wqs5&Zi-sCt+f~Gtc*g<*RG6)KaC31LQ7B!Y(ky(ou~<pV<3Koad^$@
zTlG_Nq^sl9>m3vFB<pOf$#^B|;w?qZupV`4cHsS)Q8Rvp%K2UUyJxe>T|Vl)r%}(9
zqjJ3(o8p1ZoFe7o2L@Ecm@Q_H#i%OxLrpLSJvbRV;u36w|3>8`eyhn@I%<JdsEzeS
z-KQzm3e@v!ZGZPxPLU!z!GL!3Eh>k<qjKo8%>+^hm61#g#XJndVpI+KVK*FtnrAEO
zxg!{WpP@Hiz(Tx?+DNjy-Ap_NHPHmypN<~-&!SG%8Vtv`P}M(xL3jrBSL6a}p<htX
z|Ah*~Z-?1XytRQf6Ll@zmNYuin1Bs%FXrF{)B+JZO(03Ag$gkO`(iMTL8W*qs#FWG
z9xlf)Jb-%sB<kW{L_L?V>;9iN*GZ+Jg&soHY%n&$nWz^xpaR>6`V@VIDvj4}6F@xr
z&~Jo#J_D7BLJY?e)VFgG>hL~|3iuU_(_fLdX*6fxL)3%6qYhE*yJmtMjH2HW^<sZi
zZ710A*{CzL1S4@9*2ND{0bfCF%&*!6kb=?l+hQc^JAG;B(2Ygy{3+CRdL5hL2bhJo
zF%=u_G5<2?feL&&YJ4jy^=GjO-bH05Wv}_PrK1k<Bd84wMOOn8XefYb_JKL5lDvdE
zOv_LcuflXZWc$}qpTN+4CeU7}faao7zaMq#Pul(&)O=S^fnD84{(WiOU_giBSL}&3
z_M6)F#uEC&P|t0_INXI=_!R0p5OKg9&K{UYe<Wt(>zIb8QD^8bsx)=qGk+}F=>I{`
z#KRc~!7-@F%22hOfeE+>6LB-f;BnONS5P~>jqS14`{o*#qE3Gw)S(=S+Tb))CZD%%
zaB0+K;3(>a@2z)HB?<VO`8^6%k{nFLLR1Y0V=g{{s`*;fcjOE<#Pg_Y>Krtg2*JK|
zTVic=D`{v4>#z=1+x|aLJN*{p@g8cTxI^YNr=o{`Csd%L?f69N%hnyJc|JvD_$ump
z-Zj6wj?ZCpC>o$9N=KC-7qxH!YUh1W5f4M9v<!7CUP4{Z1E|A%#(EBQi!PxT`X4c8
zAQ1EEXJLr$|5zHjkJGFRu?_tVs0F`4Mg9jWuz(Lt?L)1}sFb%rJy(bdq&xaxKlH|d
z*Z_y1GVr|ms^LN!^>H^=ok~yKxi|f%7CTQ3j|d5FmXVd6k(KAkZeEa;v-A3d>>4%l
QcP34$-+t$m-N!@!2aHGqhX4Qo

delta 11383
zcmYM(2Y6RSy2tSY351f~Awd3t5JEzLB(#JUkRlLjA|OPNkkD%qX|8*yQdEi*L1`95
z5QC6_Ac6!$gt($0OA)*ROI5k3tgLv2{r)oZJa?bx?q_EH=ghqGzB4CY_xxh7vL#;b
z_rcz)9saYgvg6djOJVB$|9{peI!-d(4cGurVH5lf^}L5pFt$ha`=JLXVl!Nd)$kBL
zg~xFq)=hGpG{<qBA{uQND8?#y6FcJ1=z~d39mfk>Vg#mPBkYega3=cWeDuYY7>b)w
z&+W0}m(id89ozo{tFXRPl`u7tuQdYoV0{e0WK;m1Pyu#D1=0((^N|>U(@^ugh|0tY
ztdGU$hu@%{{~uJ6f5j-)cd9ivk;h_f`pKvVGcg5+V|9Ghj;}|hbSEm%eW)ED$6j~|
zhhaQ*%fy99wVZD;1~sVytB-Ctjjl8(i<5(jY%$itO;{E8V@*7af%qk=G?!7CxQ^QS
zU+9h1QXMA*{ZRcFRB7VSgQ=+bvs1~xUYx{$YBduT>6^$VoPVGKdxYtj*ursI;V4uo
zHlW^r8#yjcF*e3asEt%@={SS14l2+hREA%+{jDv@zasgRfx39XKJdUk5X@?NApw=@
zt{8>c*bt|nGPDNu+y+#N_hCF<#8~ud?KnXgkNQ0wwQi0}BZ9^>9Dz%1{~l`MYFrIn
zy8zTqQ&9_bz+ikD({KW6;&)Lc`T|4o0_wTDr~oSQa3>5wW!8O)hEh2fbxIc@*>l#Q
zCMrkHjdKZAL;rL$aTMzL=BTsL0iVF0s8TLP9kRWs+i(FD$nV$=tGBI~&vm-dP-?SK
z5$2*MEW!YsjrtxeM=kg@avYrRF$9B|O@}NFqcIU{V=t_Sqfmh?KxOnj)ciXur2YqJ
zXrbe%0M4OmcN=?PaC<Xh4(i3}s0HWQ{vuRnR-taio2cu$4OM~?)OGy=RqAh0slSbl
zS>FloU{aQWdT<PCXHzi}7hpJUM3rO@*1^wFJH3Wl@DXZ(YNSgU^`J`9%=QaW^UTF)
zT!(Hw8vAMJ+MGunqRJU&hq0&y8ly7P1r^XhR3MWv3TLBAvmO=rb_~Nq)^AY(-a(y#
z`>2fhbmIPN;!uucEsR4=kbznt8x>$aDv<f8oozzhhGNwF`%wXuqu#rKO8p&FfR9ln
zj_PcFPecXKuCr?*>%o9(n`Ivuj#_An?YpR3vK*D-HK<!sj7sS>B>T=oYZ`f105dQJ
zUqNl~Fe(EVQGx&L($GSWQ4#rfF(0BR)DF{7JL`gaVF2nB=b^6Icuc~Tn2Kc>jsM0t
z4C`uahjr<Xw9Y|g*4;#-FO5T}n)!EgoZc9V3akLN&>YlGx1kn1jJ)F9#fI3TyUEND
z)J6(W0lS!hD^Q2~6ZFPo$Oc{KBn?e?7F9d1C;3~Cp{SDd#40!t{V)d=$T-w3n1hXQ
zqaFVo70_jjL$4lY-UL)YZBeD^jZv)c<kHAu;P0r3PNNohSn&Wa^)!bs$@(Pn?Quq8
z4cvrPaXTvDU8o%%v>w44^p9h8JdHY(moR|!o&V6#&a3q@6VyT-riQ49^N?7aX;=df
z+wpQ#$u6Tx^&9H;RL(SqEgV(z=BSeNK^@+qwqJ;DECaJ?=u~b&{!Tdi&<B4(rTh=n
z!alvtH3~-UpuV*OYT+SB49+ARgdd{<5AI`1m4mv5Gg04>#eK-X2Hvs*yHVGr9J#X2
zBh(?w;Djpj7cmAmVlp1a4Ez-vU}`^;$w8<E#-QGtgL-})W?(s1L*M@7UnvgjZ!*vb
zRikwD!!CAw0O}CtqiQ=I8{-sICSJ!N+>6T87pOCF2Kmf87g1*>a)8N1HY&iWE)6ZX
z1a;_Ep=$a*suX4Dj}K7+ROh5N!vNGm9Z?JQ#G2S2m7!-)J9jY%UqfHqhMI3LYCiWE
z4PA$F)EDXp)S-EZIs=i}W&sZ-(r<*yKo%<S!KmkQu`-TB1vn7{aRcg_7Na&+jtO`L
zo9q7jK4t!)us!nibcSI%zKQxmT|zDRCu&Ff{~ol1NYsLjP=`1Hbq4yP<|)LcxEGcB
z>qruvm_g=CS%f`w|KFp*Z_ck6f;|SC$e%$Sl1b>n>DINV6z@j`@*Sq&9qfd4pEiLE
zM|SAUvzB5K{p+ZWg$$vu`=3HXhv-@ChJV9!Jc_OH5h??%hMIudV#VRa0LBMcbM5a1
zsEj<1+R$cH?MqQ5D?<fdj;<cKNJEF@E~;iuj_C)XUTA=NE(vw$I-wTML`|H7I)q~}
z6sK4h*xz5bZpBD`FGZc1f8?nCG|n=h9bQE(a1(W!e?`6U2(@6uGiHHCSet%3+aH9g
z{RC9WmfP`lsOO3?4o_esyobtA<S_EDh1w4@JMMwn$xz$RMgERBMc5q=q5`Qh+}xHh
z)CQWNGSm*Wvwo;d47R^dM5TNd*22Z8=ihc|Xu*%{z#&v^PuuYyPyyaVE%X~|ht9L+
zx$3BlMc96QRLPp77p7wxcEEI;feNq$HII9MhEo3-DzX!(55qN7Ah%IFeqi+(VRjOM
zS||>+f#!C+H7d|<sQ0t%?;|jQ{utD4S&5X!bv~z2pMfi=3B7YoApWS7#baG;jauj_
z)N?tgg+^gG7NQRE5>)EfV=C@KW$-$x=D(nJ9zIeZCYOI)qM;w!p=vS$Bk(!vE7*Yk
z7SsYKP$~QlmAPwn{1$5Bhp3Es<(a@jFpPczYC{>QdHSM<^_>wk6!BbC0I#85cpnu=
z8Ajm++y6J}R`}(ciQ-ThXoH%kFY46i+238%d@E3y*oq3Y1YM={6B>>2sP$)TMn7Vd
zu{*}opN{o$Gpd$HQSaSF4@QnQ&!u5i`njkQjJ5p@s0_S=Rj_0<`L97^KLbAa8LIy!
zYJzj9RDO>!co!RD;285MZH3YF^U#CyQK{X6UicB}5FS8pJYoF`6~LJ><X<Vdz(7yD
zj`{*NA8Y;*tP|?N*%*v3qQ2?tP&+$`O8q0$H47VOPIq5Spg$Mu;Rl$EU!pef2sLl4
zJKpR#0Tppe)DF_Dy-*o=#ySxd;0w0D6cx}$^ubf86rZ!d-#}&Zchs5q3w4_!Czvzk
zwxXeHGyrv|hNE7XfgW^G6K+POdZ+E5Lfzx<F&={^n)lMN4*gE3)DOc(I03V975d_B
zBw*M1okm3p(T^X(CYcO0K%M@USRH$#ZowdHA*!a!P|vNh?y!D_{)}J3YWO26<@Zq;
zc!)l_|B;i;10K|bjZr0NiZw6;Rr_A3K!#ys9D@q{RaEM?p%&PMO7%ymlAcCo=${ye
zk5Ti*O<}{V@1)Vtz3q-VL^=8a*Ps@B2NhT``eTXx{Rpa5Ut=JiLp^uP`ZFqkUr_=4
zj><&zRFi>tbd`#3G!9kb8ev=d4GPVn8jdaKFGtn>7zW{WRE-~?2Sba@ZD@(g*jVHb
zrBh@*gBkQwp5rTvg{bE~e2)Bgqj7)%rLgiev*Q}rfPN^p!ZsL)lTo#vjUl)emFgYX
z3Xj|IN2o7e@O1OHBp#Ki&Zv2MpfWsUI{8;)3<IjkG*k^2qf)gDwbQkz4D3NYcNUe2
zTi662Vk|bAVHU_l1@H_;U?J-Fmr#L!i29O#=GuXqs2%)?%0$Xcvp_oPx@2M~K8*@s
z5)Q>VSb&#t2=<$0{+aQ8Os0Pgn_}4WrsiExCC){CnB0vt6yZTsiq2vHUP7hnCsaUx
zVH8&Rn>qC{sKeO?m5I)%%w?kj9)dbsqcI#8pq^ik3hZ5@>zt>N#z2i1Ok`c~N&2&~
z51v2;7WsGcsgB0h^b@fKj>Ouy7UyFLD$q8Rwiafi2Pa`YT!tz|G1k@nKg0iNf?u#9
z`p!0A!W67azZa(BSkw+SU?gtE7(9$R16MHt1Lm0D(@}>w3pLMlR6whdDmy#%J8L@e
zbIrt=7*Bs7Duph3@MYAY`2gEv88*YmsMI!_XU;}9RLO>-N;(01;(Y9Yr%<KzCrz3^
z9Nl&_8qiS9pG7S&1vODIYNwyt{&`fbZ(}C@i7LU93(O&V0kzW|sMCKEJK_(h`8_Y1
z_nV^*bLSVyza|{SfWB;Fu`|v<1#kd$SiVFLKEkRPz0h2rI8;h|ph_?jRf6SM6Az%~
zIgSeGy!9^Dq3^wj{5Pi&vxvWZH~?dDH!9+DSPgHYQg#pZz4!}#u;ya(dk8k7Uk6pH
zE*Oo2F%D;71Kfmq?kMUD_@hfhsrVh0>Y7VT3S&|Cyfb?6DO9GWVRc-D3j9@6=8j@F
zJdN6Ut(VLhXoyMl+oLu%9`&7Bjta;<PD4BV5j}Vxm71`ZO+YEuUZ`7=hf1Z3s`YC0
zU<qnx-=YHlKl^*YD<+U6)O%e~?+ryV<2o~GXlI*IU#i{c!7HfDR9<R!9D%yOF{sjH
zpnmU%N_jpiz?tZWt5Ea4W&5RAll~E`fnQ<8{l7p%*XRK%a{p!K&u9#4!Z>V+ozR2R
zu{W-@-arM=V!1i2PomzNg$i&r2I6*9i4ULx`xfhP{+t^$R8y}NCUQU2gi)wN)(mw`
zTVnziVLEO?)$}4J;$v&#tEPm5tVO7RR^Tw)fttVOO7h>6Ml=mYIu2W)i+Z6HyWlD8
zh@q>@hbJ5LiJgyuxEWR3UDy_nqt2AqYO^t445c5A-7(Sj3s+Nr?Q9VPs>w0*#;;K|
zJc}yLHPnI+u_=bHF+1#v%0RAlAu6C97={N?3!g!y{ucJYO0SuDdc8*eb=qe!pzH7&
z>U17JW#9rTL-$c7>bTZ?fO?=m{eGwt4M!cW(bhs#ATDa&<rs{msDO@R0AA7q18Dq&
zTCn3fKEpT!wZH)k$CIcDuApALj}hqoy4hJB)Q(%CGS>_B0eTu0$V_aEOHhH9Vj8-K
zX=rB;Q7?MGVHOTXEfj;wNHS`{zNkP(V<yhRTs)4dZNhq!(E`*4mZ5gM(e_I)lKv5F
z%lgiDG<3)!HkefBU@iJvu|AezJNy^wxtNXS8jivs`U_DLu0sX58{6PXd;+~TnKRWL
zwV_N@U^!UvzyFV?p^2tqG|sE|fqyrHI>p;C6?bDa-asu>b+gGtJ=7niWYj0Pjnzdx
z|2anC4OFHpziGyO(br|535~9ph82efweWJ(&ex%C$3N}(6%3(&2b1uT?KgSLyq|$e
zd4JT|8HK9(3+TbcSQodWs|dfKp#^WDFaClp@sS;G@wQ1_d#u8EZ}h?}Y=whRC0L3L
za4UMS92MYC*aK_7V@jHb_2@5rhx&J-@h$^;@fLcc?-p|#f>4L832M9}Hp4EciHk5D
z-@+Dn8M|QcyPSL+gspKGX5(!v!VX)_{3Tn-ziR&#14{7^*c5-nhFJSO^Y=RgRhrSL
z!!-l7qh091KT#R0v&~FA02SawRPEnDZS*5l>Ha_u`nlW94^8n22Bu&YEXAt$G5TQ{
zDifzrwY`ef@c|}arT5Kv6Kf|_DF>oX{Yccph1P{wan|0Tp$T_jH7r9dbP~0|Wz=cE
ziJIUs*2It<=9)%Z)2vz6iKw%+5Ve7=);;J$|0r?|U8kIeCcKC`L^rTvA=Gyu<O5TJ
zB-HQOs8miwy|)wf+yShOXHjS59x5}QV*9N}?RXZd<S$`O)^|40@G!6qyW&Y~kAXYQ
z3w=;29FAIGGHPc_P}gg_wG6eudE38@3e5S?Y^XLWqfJp6ZG%Cq@ARXgl;mOnj>ABl
zg(}HQ*augkGII^}+yktEKD*3y48{!l;i!!aLe0AYHP05?FGdgjy;$+@|IX0}V&Hq!
zS-6M3SY@~QqY{i-C?0hvQ&EAWqjuECI@p?vx+N2^J8r>P{25a*xWvrgt%Ur07|3Ek
zf4zz@7?+?QZa}5@eN?TFU<`hRfp`z~e5F$J9SB7|*B2Y(P}D{ipi1^C#^Y|(d*79k
ze?@kef%+J-$9zayp=vZ9705i)2WSQA#WkpmY(r(P6!l5{9Cb+lg$n#H)ENlfYvyf=
zdTu1@EX{FgXoB?^ip3a?M^QDtXvgoMCVGq^SnDJ62~9!;o{8GwWK;mlFdW}QJ^v}H
zRA*2bxQub=R^4a*Jzf$vXW&_Egey=f+>b5rnjMeaZ%UAXO&HHbWo8*B;VRUjJA&H4
zN!!1O3gD{k|Adsrb?(#9p{n$;nYbDz(oeAcfv7Lz3{1gKPyzifDs!<1%;|51>ZhaT
z%R~j1h5DinMxBjeH~`0?pYH!b8od}OM?DzviAi-`)WWS%--G8d4EJLzJcY?v^`OaA
z8`N3K#fraf*pU9asCmCce>{x}><WgkzH@^{6h6ed7=Fkcz80w3WukWWEOy2M)P3HA
zx&?<&hw>C^hgVUz<gPXFQxi}M>iPcGTy#~FLi@lAsOz#G705PJ4Uc0>Jcp{e-(eF#
zI%<bcpl-=n)R~!%1My8%#{PrafPb0!XG0IF-@c6eN6_fYKy4h2nrJRY<8t)ihp0fm
zvE$!a|FlLOF&S%%N^utIdgh|$nTR?Qub}2xg(|_uBd%HaZ3eXSL#T+$Q7OHGx)t|P
z*R$bKbGp;5ol)1QCsxL(s54N6X}As*&>7TqylVXe+tUwpKQjyVK|Pp<-dKpL{S52N
zsG4s^J+}>Y&Gw-;9!4)bhOu}8m4Umq{|DBmU+)<I)i8e4<bsJKiW(PsR-Q}@D%qC!
zOY3@`>0>8M@Z{!u^71F-7v<-9c*Zk=q2~(o3kpkCjg0j7OHN8oNlHoaB&Ve}Z&k8?
zYI3DYZAyMDsNdP+nLfE7ugEhcpLr+cPb%_E%P*Kdc3fV5L7r#Y<jDmqKP(L^@!L}#
F@LwWtG2Q?G

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index fc45d08a..76731bc8 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: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "niet geïnstalleerd"
 msgid "installed"
 msgstr "geïnstalleerd"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistieken"
 
@@ -47,9 +47,9 @@ msgstr "Opnieuw verbinden gelukt"
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Onbekend"
@@ -162,7 +162,7 @@ msgstr "Wil je dit domein echt verwijderen?"
 msgid "Do you really want to delete this user?"
 msgstr "Wil je deze gebruiker echt verwijderen?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
 
@@ -283,7 +283,7 @@ msgstr "LDAP CACertficaat, Certificaat of Sleutel Locatie is ongeldig. Voer alsj
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "DB-instellingen niet opgeslagen"
 
@@ -313,7 +313,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Database Configuration"
 msgstr "Databaseconfiguratie"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -358,7 +358,7 @@ msgstr "Gebruiker '%(nick)s' bewerken"
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
@@ -393,7 +393,7 @@ msgstr "E-mailserver-instellingen bijgewerkt"
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
@@ -493,108 +493,112 @@ msgstr "niet geconfigureerd"
 msgid "Execution permissions missing"
 msgstr "Kan programma niet uitvoeren"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Aangepaste kolom Nr.%(column)d bestaat niet in de Calibre Database"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Het boekformaat is verwijderd"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 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/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s is geen geldig nummer, sla het over"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, 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:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identificatoren zijn niet hoofdlettergevoelig, overschrijf huidige identificatoren"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken, controleer het logbestand"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Geüpload boek staat mogelijk al in de bibliotheek, controleer alvorens door te gaan: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Bestand %(filename)s kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Omslag %(file)s niet verplaatst: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, 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:1096
+#: cps/editbooks.py:1100
 #, 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"
@@ -607,175 +611,175 @@ msgstr "Het instellen van Google Drive is niet afgerond, heractiveer Google Driv
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Het callback-domein is niet geverifieerd. Volg de stappen in de Google-ontwikkelaarsconsole om het domein te verifiëren"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formaat niet gevonden voor boek met id: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s niet aangetroffen op Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s niet gevonden %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Versturen naar Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Deze e-mail is verstuurd via Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web - test-e-mail"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Test-e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Aan de slag met Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registratie-e-mailadres van gebruiker: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, 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:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s versturen naar Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s verzonden naar Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Het opgevraagde bestand kan niet worden gelezen. Ben je hiertoe gemachtigd?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Het verwijderen van de boekenmap voor boek %(id)s is mislukt, het pad heeft submappen: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Verwijderen van boek %(id)s mislukt: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Verwijder boek %(id)s alleen uit database, boek pad is ongeldig: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan de titel '%(src)s' niet wijzigen in '%(dest)s': %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kan het bestand in '%(src)s' niet wijzigen naar '%(dest)s': %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Bestand '%(file)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Ongeldig E-Mail adres"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Fout bij downloaden omslag"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Onjuist omslagformaat"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Locatie aanmaken voor omslag mislukt"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Omslag-bestand is geen afbeelding of kon niet opgeslagen worden"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Alleen jpg/jpeg/png/webp/bmp bestanden worden ondersteund als omslag"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Alleen jpg/jpeg bestanden zijn toegestaan als omslag"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar executable niet gevonden"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Fout bij het uitvoeren van Unrar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Wachten"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Mislukt"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Gestart"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Voltooid"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Je kunt Calibre-Web niet vanaf de lokale computer openen om een geldige api_endpoint te krijgen voor je kobo toestel"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo Instellen"
 
@@ -784,7 +788,7 @@ msgstr "Kobo Instellen"
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
@@ -850,7 +854,7 @@ msgid "{} Stars"
 msgstr "{} sterren"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Inloggen"
 
@@ -1069,41 +1073,46 @@ msgstr "Pas een boekenplank aan"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' aangemaakt"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Een openbare boekenplank met de naam '%(title)s' bestaat al."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Een persoonlijke boekenplank met de naam '%(title)s' bestaat al."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Het boek is verwijderd"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde van boekenplank veranderen: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
@@ -1184,14 +1193,14 @@ msgstr "Categorie: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Zoeken"
 
@@ -1211,102 +1220,102 @@ msgstr "Alle bestandsformaten"
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lees Status = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Fout tijdens het zoeken van aangepaste kolommen, start Calibre-Web opnieuw op"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, 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:1452
+#: cps/web.py:1453
 #, 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:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registreren"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Er is een bevestigings-e-mail verstuurd naar je e-mailadres."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profiel"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
@@ -1383,7 +1392,7 @@ msgid "Upload"
 msgstr "Uploaden"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Downloaden"
@@ -1550,39 +1559,38 @@ msgstr "Details"
 msgid "Current version"
 msgstr "Huidige versie"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Controleren op updates"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Update uitvoeren"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Weet je zeker dat je Calibre-Web wilt herstarten?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Oké"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Weet je zeker dat je Calibre-Web wilt stoppen?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Bezig met bijwerken, vernieuw de pagina niet"
 
@@ -1595,39 +1603,39 @@ msgid "In Library"
 msgstr "In bibliotheek"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sorteren op datum, nieuwste boeken eerst"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sorteren op datum, oudste boeken eerst"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sorteren op alfabetische volgorde"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sorteren op omgekeerde alfabetische volgorde"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sorteren op publicatiedatum, nieuwste boeken eerst"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sorteren op publicatiedatum, oudste boeken eerst"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "beperken"
 
@@ -2472,12 +2480,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Auteurs sorteren op alfabetische volgorde"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Auteurs sorteren op omgekeerde alfabetische volgorde"
 
@@ -2966,30 +2974,26 @@ msgstr "Van:"
 msgid "To:"
 msgstr "Tot:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Deze boekenplank verwijderen"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Bewerk boekenplank eigenschappen"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Boeken handmatig rangschikken"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Schakel verandering van de volgorde uit"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Schakel verandering van de volgorde in"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Boekenplank wordt permanent verwijderd voor iedereen"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Delen met iedereen"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 3c1424b46a39204b6817d00519046c223aca62ed..b1bef7475c176b3a26b1cdc75310671578668145 100644
GIT binary patch
delta 11287
zcmYM)3w)2||Htur*k;&lGuv#&W(S)YcEZeJ$jl_C99GVU2q`&il-nsGej#!u66LTQ
z^Ha@f#8RX}IqWA=DZfbgr5gX&+jTu2{~kR&uj~Ha_jP@)&-J<P@1}~ESNw8WMYk-l
z(h`S%_EvD5+W1XP_5S~#d5MmbOm{v;;{j}lS5f!-(+R{RRKGPwVqa{GQ?N1?;ZwL5
zd!lcW<77CF>kOgMoC|Bv6VG8QyoBBu(a3QsVl0MW0@lZDtb!xZ5659OoPj~O0CnHH
z_WBp-NB_L-Uq?^ocka>9K>t|13EPi;AXdjHQ~=4S0Mk){WTIBy9joIo)HoARnV5$4
za1Hw6A=Le+P)WXm;mq&+NkfqbHF2CUj6&Vm5>xO=^ug)&`aD!h*P;S_54GaGNJ^d0
zu_b!3Z%<%b?2ZdD53gZAOlEMm6O9El*iPpXMxjrti98X5>32r9%^8Y{d=b{d_s|Ou
zV^u6ge>{WQx*t)Q`VEyCuQbQ0gaKFsgVV^rE;QhRGSC<!u_bDPzNiN$qV{q+D$vcy
zBAv6Sz`WBPrv;{AQyhcZs*R}Uw<6`_?8OAUhBdKzQ}W-7Ml4S$(pOMhu*CMaqXIdO
z5qQOZ?ld#^hokOKMQufA49C8x%oN(sr=l{u663KLbMQx(MgWaQ90A?X8a3e{48fOi
zATCA?cn@_9%TX(f$}j;m#6bEv$iGfLe^kfCsBt%-w&qg|!gHwm-5WF%z(dT&0P?7m
zc1NXfDyn*CA=!2oqXsHP>c}~d+PZ3)X5d<=`x~KZq9wM)4yY}hhdLFzkyGM2=V&OB
zJE*Gl<_`_n4wcfbr~n6`1{{l8*%Z`!;$Nr<Pa<{ZTtpR@f0ik>7!0PLfOWAohT#CL
zqw_zRh9X*lN^vo2q9fKXQ4?N71#$zmhYv6p>px}&d=d5BJXBFHv;Ebm1-*|t6(6FG
z^L`9se&;w1o##uaJ^vB41rJcwn#eMhx~EY0y@FcdEDXgJs1@!)ZOvy`8!w<%`X_3_
z8m-Ov5va_jqpQ7XXD`e~4YU;NViDHClc+%ciz=oN3Pmf-Kuz!%Dl>gh0gXfz=}fGJ
z@1X)ajN$k-YRhhBlYgzGoC`XS0d0)+Q4we1qpC(#dp;_aLs1isMNKdhHO?B;L_1M|
zm!JZ?f?9DoYMg4UTF-~HbxkA*T+oBfP{*SKD$>5Fy)U$%&p`#S0u|sU)SmCKpBJMh
zI%)ftP^aiO)YjfXouX>(Os2D48f>%E8#VD#Ou?<FmHh{mf%~Y4t37TesDlbD2^CNl
zMqo$O3WuXo{1WQ9X{h3U6IDwqFbUnmG*W5YLhX4>d&h~xcGi)offre~<D;6uC%OJ#
z)YfI?m@k{|s0^$_O|%_VQ{SQ{yopTZM0DV-tMfmYhEg*JwUTwHh>NfR9>mJ{D^|ig
zs1@Ev4Ol7HY+VW_({GC{a6G2tcGMRAh@N;Gm6<;=Sm)oXqd6`SsEAvjA|8Z9=oDfc
zu0_?zr>FqWp|<Qgs#YFgcMQuj<2;WV=PlId+fc<=YW)E-ncsOxqY7qrGJDh>tI~f0
zwc<Y3eyIBfqYplh8n^&e3yV<!Za_W12US~#Pyy?Q0T%59qQ-d!U48H@4eePWYOiNw
zHQb2Wnq9Vk0%PcZiz>=;<a@~R?`+;|x#&y3D{6xNsKA~>1v<(47V5a}>`eYyyz?m+
zdSM_Hr3jxxy}@>)1~`p+v3zg)f7yPOF6OjEBd-vrC#txXp#m?%D7=TNjnJ;V|FI)R
z<Lh0?zdwx+xS$CRq8|JXlks<KjnUmq5e~rs`lC@9a8X;a2(|K6_WEX2u@$4XumltE
zI4TpjQRDczRE$y;iF}_piI|BaP#Jg^71&|aL>Ev+bq#gw{y}X)U=Oo}d8mo=u`v!n
zjlTfBa3v}u>ro4JkI+yg7g2lu8~WkjsDY|HWvbjCRU5JBjcri_=3yds!&IDtTJcU)
zz<W{mAHoV)iVEy=B=fHG4-Ku<x2IWA18hLQH8#PK7>TQp*SAxQI^QZ7y@)bV6Xv5<
z)E~8giKq!@p^A2n?H8f;eh0SE`9DLW5f?&xo7CqZ+vChYt>`S~VwFDTH<un*gZ>s&
z?HoY8puWUN{LcCpD%IinCZH@#q2CF!(Zy(;|3fsi(reb>r_Gx!2ercSw!av|=^sYk
zx=tCkz}RQ_;=%!_Oe{kMv>H{E8?id>wjQyce}k@4bBTslRH3h_fne0$MWa%gg!;TC
zs#dz7RzAq~UqapgD(b#BP(}9+YT_bPZS6<Z%n1y_ulkaIHGZ-;{A2a$XR1CJRXmMR
z12jXeupMfGT-2Mc2ZrJR)P#koapzzduCe`nsJ%al%Fyk8<X<=bZEy7NZ{GEZsPBSq
zs0>X)O|%x3fi0+&6x;q0<on1ui#b?#fC=PTtVMq!Y5@yT8Cru{*iM&*0{94Z!zonC
zFQOj&74?AUKr>-2R6i26w`ulz8&rU~sBxY`t#A<PzLBVm725tx)Rwu6XjG)J3N!F+
zR8gHrMObr?87Kmk`Z!cziKzF(<ERPpP^s@@9f4X%A!?%8sEjSL*Ow!Ky3TtvG{7Ev
zLka5qe}+0PcTsy7KiK@3-WE0BFjOEfpeCA&5x5*R(O%Sj`%xJ=j=^{awS_k@Naz0n
zjZ`kw7-CYGgE92Gqf%IawQ-ugz6P}gB^ZL|tT#~udk;04tA&;5N1?9Ap~h>D%2YN6
zGr!Z7Mok=!TFDgD1M@Kw*P?3VAZp?>sQa&@0(gjeFN6#;{Z!Ox$U}`Y1hw)BsBz|_
zGP)igeg7BJ(152<MRW}n>F?-;e_;Z8JZpa;!N&BTvc8J(^!H#rEJJOf$8d9hLyV-~
z6LsH2)VOaCC;v+QCVSxmDg#&06Msil?f=jlD~vGxDyRW!qEcBKqp%^yVrNXkaTtl~
zQJE;gig*UKHQ$XO|7w(RK@(m@W#BsM4R;qGL$Bv-wPPUtJk%?@A8G+_pi*3dIz{JE
z#TzuzWFiOa&>xG*xDXX+iAzHhU&ktV6BXfKsE8j}{YROV*0ZLd0&HXZ-BAGzMrCR-
zDwC`1=UY%2`xv$Nhf$}+y+lLB^EXz*kkO`iVo(ocp$2Ma?T%X6AdJT)sQdP#PRUX9
z#Vc4JZ($D%ecp^e8WrFqBx9~KorWG*j#}|1R8{XoA3Ti;@PhS!s4c58#@rWbZDQ?!
zetbRvE8`ech6_+Do`MQs)uYeZ{|z)W;5JkMJ5gJ41hv<vP=Q>*1iXRT>);p6KuM?x
z(ow0+L~UVDREF{~4rido+l*RpF+TeJ{{#&c&1L&R*o$VucvN61s1-FsJ=h+V@*e1q
zPowS|WqlD9zywqPlTev>2bF=X*3Zzr?cq2-(`d;D7hW>e8amGYDup^$<57FN)VdoZ
z>7T}Qyp2^cemuXLV;T;_6_|z|6U=>0QJEcu{7~ggoWTAobzgEpp2cXqh#J_LXja@5
z_2z4bdgu4XNF0m0?@fEX6a(mAMP=qL2BBAhSy(u#-yT)$PZzNNY7FOsQZ(K=1+|y2
zq0a4k48}vKK)yv)_YG`-L51e?R;UH^L_I$V8{rbv79K&3_cdy~+b)gfG<+tRJ#B*_
z^m9=U48%};0aZM6Fbh{<Cp?e+vHoQ9L+fkUTh~$7Q(xx&k8h%i@K0=lbzd<HaJ$fm
z<U#@F;&Rk+yNb2&A!=)CO))90i`D5jK^>#k)()slc0m<qU(`Z|pia-rSQBTVYGM^q
zQ?7HGhW6?=Y>W>v85^@Tx^W;rhHqgvJcBtHKh+HU0xF<Ms8r9j?n6!dGyV&2V+>B4
zX1=60VifZ`r8Hvs;8*)Wz;x43!zixjV<f(e%FJq1D)*tP{xXK)4U9nV8RqwhSj?wC
z5VhBzpi=)e>b^=dd5-y=dNhV&7Ake`U?Oftt>CQnGOGA~!LIlK^*-qGs(CT>L#22&
zDxfu}`}d&&{{o-D>zIMfW|4pG;fpl1cZJvqXQ3Ya8np#KVG!1S%?y-`y8j7O0QvYd
z4o7X>5p0O}upUOwHbvYXpQPU(RooxUCjZ*|{anzwJ%yV1d(`#2n2la@OaL7)kA7c_
z#P`t)KSQ08)2I~xf^{%_uBnL@sQ1JO^u)EO@!y?G{#B(PazPQDL>;qBsEKdkP)vE<
zOt=gmr4+rn{smUTGpK>jV^zG2mGK5r<<4E(51eN*7>@B=Z|2fyKw|(Z^4GBneu7H*
zF;svTZT}7`Q$F)eK;c-IeoL%~&!EN`fLhQ(%*D4+nfe8lncp!1U4PDoj$I4Xjn82s
z?nXUu8KdzhRB=^(!%Q57T0t9(!I7w<TY#$eEm$27qqgQNRMr2A3fO1CqfEL^0u7}o
z3pGJL>cJN<4yU3X*n}GB80!AZs6fl@=LrkV*5%@(OrSD10R6B4wRNwdws<8*==>Ma
z2;jo!)-tR{{}w8ca@+S^WcDr$wUVZ&0ehe_H5?V_80?R4pzgbgkE8FKW`W(Y3H=cm
z!u-w(8rtifs0ojuFP_s4cn$rr9AnXMu?a8@bv+vcup6rAhG0t^jaj(a`ZH?cxFzNV
z)eGHBF1$%22~VLWC`avi^jqe<=Ac%x6g%M_)Wj8*n&)a@F#T-QguSsNzJ>Mid(_tX
zEHewNXH8i~{#Au-xKI^Gp;l0U+Ouh>qFjJA@jRyDE!1~H%yRSJfCgg-{dZ7%|1s+M
z1E}XtVkG{6dfsz|xj$nC`ESI9u3U)1sThdsu?FtJAS^{4n=%}Y<*0#1t~3L!MHTB_
z)Elo1RSO=g%nK_DwZPG+<6Vf#;7pf>UK~qMd%hC&VtF66r#mnmOHeDhkD*w7wOL_2
zs@R%gZCr|da5t)m{nnTTgkvrGO;B6g5w$?~c^Y+SOh>JB9VX+4w*NC~&&yH8*>SCX
z=c57~j=DYx!*DKYqIXdNAHWfK2Kj<?TD@)lKY+tXz^)Uz&ZHt8H9&jYA87kyF@@{%
zF$WJ~PprJ&>}h{&NPjA3;5JmiKcR{_?Hv<nJ}PsgP_^<ZX6XE{rqP)T=TPT3Zi5LV
z3AINZP+QUmRT~2_0>`1YZV{?zm*F$G4)tPsfSRzuyC!38u`T_s*cz8$UFLVr(ul%)
zs0l+inpbNA>R5HdCvgNS@_neiJ&l=IhI%e+lewOVI#tb4feykroQisW6DrdO&{gE;
zY1F~1sK_h4XZExa>hs4?)t-aBaWeYgH>iorP{n%_D`GinD?Hve*E3P?mt2g-iKuZ_
zzEA%9)40Qh80@jxocBUhs!C9idv7scvyCvEeky9>C$Rz!z*rn?`*Tn=GY_-z0JcDn
zt>#tS65G(9zLoqdg-5y2NjGfcY+`5B-W^9x^gVjvZES$|u`b3GnIde5s`jC%<2o5t
z3p-E?@cY1g%cf&%`a@CUY;<X8pwp;`e#d&4w%u$+FKkJF25JQdu@e4`KIrT))m;S@
zKyB2yPC;*Mj|!l({d_zI(0?7Pqr2KRwxO!K*!m^<)4z%u@D6Ig$~(;f{-}OE)IbeT
z_qRY#%tJlb)jHH#Xq}G~q3f)pp$9%e4Rjc*;#bx(^rQa^M&f<csR-L;UNp%VPd^V6
za2z(qHK>42qVE3>>NMQLBn;ZE_XhjlhK4STK|Qb<gRlq{Sc$z}irUlj*cY4aF)3ey
z+QKcU=TBg5ylB0THR%U`XcpEGb^MxR1oJ!HY3N+OXm6N<D!wHch()O4JA}%_aa5+x
z+5S(c`|hE}@!4x8ioyW;NvLDl3Y%hERMAhuM?e36NTV_r_M;{`hRyJ#?R)*(tiTt8
zxE_s>*xX+4gPLdz>iKCHjI*&Cu0=h!6;(5bP~(^WoBX$<;jz!0-}ab7e-u{1wWw5X
zMon-Gb<V#-ZOube;GQ4ZZ#&e);iwFypeAmEx!4O8&^pY(qL0YGCi<BRI*)%~GS>On
z6jvA2i|IM*8yG@=H)<uHqgMP4hT#QN4ctTB=lzK(y1E!jKMPf)J#BxgOQR7NmZJhV
zjw+@<uol)RHW^65aQYol6AiOYL%q6Jp;rDe>NI?1{Tu7kkJ)bm=!7c9p;mV?4Xt1y
zsyLRR_U4q;`+)fiidLx97ob+K2Gj94#^D3h#IXm>7IsD-`qNP3zK)NMH)<=tLNf0<
zKhV%#-b7!#i`tTkhfH98sEBJ~BqpK)=!6P%0xE+=s8etWRqeM>wQ&cvRpnOC!{!wE
zVxZ1{Z5oerLt|7R<53Y#Mnyg!Tj3E@AeBnYD>)2Rti7-W&PCPAQLKZ%U?%z;F$;Md
zHEt)Yi2bl8^E-oRXypaEfU{65S%oU14{ZM!X45~9T3PL*CZ(~c`_oY=?|^y(c0*-m
zx^)NY{c#zi@g};Ou*Rq6U7dg`qAYBWJx~L!L~Y3l)PrYH1O0_MMn1>*>czIGg=|9I
zzXxOSAZqV_L><R_sA8^qoc!y?`o~S`QZSN!FVuHH0mkD@Ou}upe*rZ>rBbu<NYuco
zn1~(F3&){1PPY9S*pU8QRG@oH$$t$RN4cOBeupZm8>nLz^O*^xl{F9JxZVr3hf`32
zO~(ef9W~Ac>u;#QJWlYJml%x7#M7t%Mh>RoNuv<;po=P!MfUmzRH`?lR<aK@@ge*9
zQLIn@1XjgAZ2uuDbM-&x*SnL65xe#!4$j!sdT1|S-;|^#$w^I`Mkc4VXp*{X!`NXS
S9vQo;j{6~JSNtbS{QnO^E;G0Q

delta 11380
zcmYM&3w)2||Htv0*=%M9Yc^(^ubu4Bu+3zfLqj>uDd+QXGUhmjsqPXv6y+HGC?q+|
zlvB<Tl1h$=luAF6(t%Ka;rDvGuE*p5d;A~&=XG7*`@XKv^|?ORz3Rjguf0pX+>0R<
z7CHQHM|sDI#BZvq_y7M}mf|>RbeCf+9>+)VChB<)oe*q{>UTsBj>Nh+7kzObcEuyu
z4Wm*WC(ChMXFQFD43wca{)A2OI#$HgI*#LonHY{)SQ|TGC7g_bI1MY~0u03!sOPrX
z@ozDZ{x#eG2fbO}@gYo2RM{GidN2lqFbx$zE-Jt$P=T~X?R+o>VKHi+mr$9QhcQ@&
z0eBMi{CB7%-@qEI@A%d;k;h>K{WR2rd6<s<(GTa_@nxu#ZbAjR1GVELNJ^b=un~rF
zZtbu$cE*+17H?rc%w=*nkH!ib9H(;~Yhm>a6L}7X(eH;Gn==6w`6{fAJJ1JDp+BC-
zV7!bvy4$Es-A836tiIz^z*_hSCe$bY8pviqXV(-xn1@<mB<jT(sI#1p3Un8;N#_bG
zu<%Ugz!um5UDQ!+N4>uXDJSO$CgCltiZvUM|L!z0c}tPbK^?(6w!a@0$T^I{8}|3$
z$ISC7sOOubj-nsdz>%oT%(B0~hRW;)OvGc@5^uXSs?cb{70?46Q45a4aC`*^;%d}{
zK3V1(2B3D9h6<n&hG2K(|D56czaU(Vns+PeXwG6N{)Bqo{g;LU2qJ&ESPPZX!Kf6z
zhN|AhNVc8TsEN)ab>v(_9bIIOnK%jcd=pen<Y9B{fjYuvs9SLexh1ai6AeXDfs$3#
zhV%b4VHZ?N2ciNTgPL$EYG-p%--$O-3tmL(%=r~nT%N|J*y>{#{Vc4B9WesOV6^W4
z%QO_xdQ^&!p%yx0{T{X8uc$!&MV(<_6US+dkD(@f0rlQ8R8g<B{f(#%?L^&*k5Sk8
z3k+p_=Nt{)=j*65zl}PAK(?o9%|WFuANAZE)D9P8HC&I{;X%~Ve2tO#3o0<*$IXJV
zsQFV-nSBCXolO@zumm;HyI2$VVKiPu1#%BnOtmQ#?XWd!f%d4(6rci{g0Z*|tK$w-
zV5hJK{)jrV2f5^5I|*oJ?qe<MW2h9h!-rLks`lZiR8BxGI2E<PLexBEsD(a41%4V8
z;0@G{1K6$RiA23$ySZy3$znh+wnSZz9;ir1qRxJn{e3Aafc2;VKR})N0sH$g)It|+
z|2pax-AARqLJM<?B2k&{<kH}{onfej-^Fy?gWB2es0{c$VIq!1El>v)SYuQ`?Jx>^
zp>{Y4mEspsJDrCr?zd63v>sE@Jw+pfhV!I3^ZJ-Tw~KWOYT{Ma{rIpZumj`wP@mFv
zEzKXB!KeV=M=i7;wbQGp1s@<wI;pK3Ctmlzh=x+L6t$E0Q4#OMWITbsco!>Rh1O<=
zey9mUQAgJd)37sU<8<UR@9ak%(QWj`@@-6Jd@)S-Ka7U1ODZbjHV=Q`6O2UY%)$iR
zgj(n<D!`vmNA?e@Rs!3aKeNfGd7eY<d=2XNy{KY5Z~Y5%Sl<cCGdpUFKJ>exKlVlK
zxWGCJE731PKYR`~@k~@LtVRX674`mMRBfF^1svSYe6V6r^Aw`1A12b!nax6-^%AU%
z+fhez(DpB29Q~`Pq6}zn{?W~Y73ufH033)~U^FVQ5>%kGt!q%%^`rLWpDZ|M8R(8N
zR20YLl%S5}5Nd)SP#=~*ZNE}S(~m&imJH;Z;tWL<*IHEIzhN!(>11jn5g(`D3uEy=
zoydPMjSm^n0w+)}{)}l@?kV#^2C4|hV-<WBL-1A9QLIAkywr~GLKWLF)DfP>Bs_=8
zMETBUo@kebQdJN6yW-?v4o*g8U>hp1Q>cZ0K^4_4)U~VJ#T-El2GZ}1T6j3t#WAS)
zSD<QZ11ck%Q5$v7(9n*4MV<M5)I|PW%|sCxO5cO3jZD;8cScRv8&hx)X5d`Zjz2;L
zd<6CUNi2`&QGtDfWZrcucQZSU!m9j`jmg*%>){miU@7t$caEX%cQ6H`4^dmxg2Pce
z8jae(4Ag>)QANAd_V=OA{s1=9{l8434g-ljOzOKM$K)(P?dS@&#)zKg-&}^^BlLHp
zYUenrHoiv>{%oz(%cMF56;L}&$3B>guVSq3|4AC!=`CwQZ}VmAj@sdL+h2_}=%2zT
z@i)xI%s%`>2#!HzVl675ji{pBjzM_HddB|#Uv!n4>ol~ZkiMn{5>RKCfr`8_>i0ZU
ztqefze4OpSh<bhz>bbX2MYjdD@IF*+eSxZ(3#gj9)R+9LamPMTxu1EkI#y#m0aZLr
z?RZPn4!fWh=!yE$4M9CW2DRWU)VxbE0?TawDC+DlqB2yzKl#^#{{78^9!#L0gSBxG
zDnqkT3vEJWU^i+f$87%$wxWLpTVmY-CXk6(o&F3|23DdnREFBvM=lKo@G0tn?@%fK
z74_m>)C*Myngx?k{d%agZDGfsLIv0pHBUZjhvQJsO+jUBmhCS@9htj|h8K-e%)<9j
zMRg4oVf-L7Q7S6+4N!sQpguHRQ491&rM|#A8MTpFsD+lGGPcT&uR{WLogFkZ!D0Kr
zY1IAy8g*T~2b-g5h%xj#qb4jy1@b&<p*JuJ*P#|Vf_m-?R7TEW7+yvl;lCKF`yV*O
z-1Ase3cF(*4o0PLCPv~sJ6?u5g3}m|KUp7OEdB6&vp^0igYB>acD3WZQ1cdI5bHY=
zXehGjs4w6$)Q&czB0Yc}JdLWAzfb}A4K>e4p#sT3eIMG|{?n*i;iBeQf?8)iYMuk=
z>Ux~D5B!M=!0Ty~iR!3G<IxA}U=n6p`(s`Dv#dKYk^ax9qY4>jjxrPV-T?IAY)r%r
z!^poTKEpr;UO@GO3QPvV(3^fds(MqfA~vx7CaC9Iql&L1*1`c8k5e%f*P;i{qB3y@
zz0hws`PbP53^#_L77Rz#LKNytmxN6)+x|WoL+HDxPxpM(1`eW9d<S)#0!Nr4ZiUJ8
zr(iU$!8APV(om##Pzy&Dnw`d?BCLaoINjO;wbO3ap{M|hZGQ$Tpx05E`UF)=C+zRv
zp)&S6>ge6uG<0pMj5Nhl7c0|miz=QTs29efCYofOfx4cHQD=D+_1q2AZTSZSFl?0h
zlEz^d`gy4NS0VwrP8kiQY&+_OW2hZpKvng1^h58_Ccq$T3hL-uqMpmM4zWIifs8Li
zUwj*t;ZoFwH)BQJ{}c9sbEpY_Km~9GE8*X$v-TQe0tv$;`W{r^ZBVHmh+3ckmD<s$
zBb<%O&|FNw4^Z=6!~os@KWXSbK0p;s=vb49_NblrK?ODxwWAUC_YzdfXJRnEih6E^
z^&M0I>rnxep)&CmDg)o6tHymAH_CBt<II182^w#zH4oGHeIn{wtwWvdXV$Ceq3=Dx
z{Hs<1`qS@&`8W)R;ulySGmFi0!%>-CQB3}O(AdC$QdeQ3u@c7855`QakE)H~s4w3n
z)VKc?^xzuQb4Tp>J*+}Me3Hpb5{A;xMqR@WwqG)d{Hq#YWk4=NrD&aXGwLjNqweil
z)S2Hx1yXskscsKy;#R2Ni%=Vwje5Tf>)=t;5&n&uucBLGUP!=(3^YcaX)%W5v#1vq
zVKrQhDxSUA7*Ajx22SC>6Ju|D3U^}<jXz_?pT;5dkD!Y1(Pzzf!tG3>HUrbpgQeIS
zkD>mUgg<9eoq;-{cBo?Oj6paARsG|w&!93n4YiSZsEsT^74v&o6?Y*u;W{U1sHnU-
z3QZh?buj}~e1lQNvk05ur>GtJJ#YR|s}E}8)u@2VP^sQ$y^i`l@&&FSCSV+H!x-KF
zuW8g`;2y?f&8g<E*AuAzFx2mJ(Sz@yGIJ7@%Im1A4}H;`wFjf<=U@)@#9p`vRU3a`
zJ*+s5=UCrqNFxHfVLpyUrS2<C!HcLJRGMxKMHOE(cEWVj?U;s1I3JbbJ*at4p`O2v
z3cTD)=0DX$p_|3P2pT%WcTi`y5mi*XP%l=TVUC~%>Kb)KO_Yy%{smM3bFnurLml1U
z_$VgNG#TxVD&i9CfD2}le^vL74Cw4{pzf{LEVFP`)OZr+Vm2y(XRs~KLl1t7K6oFs
zfcI>Z;%JPf-vLz<qfp<8<>-y4XOn*|aGn8G=`~b9<zF_}tO{!3ILybP=)uqNVM?(g
z{c^9EPp=<p;z0DrQ1nF)s>qXU|4CE^JGe9wX^g;RT!<=;53v&df!gt1RDi*AOg|Bo
zsmAER4p<Y%pclS|nr9(uLx-_7o<U_QdalWg8&4yNfflH1HwyLOo0x)EQ7?qPYQAVS
zP{q|0J=hhsfntoqw@^iQ2vzOhVG!O%9gWXx=62LX0(PCoG?dD|s1%JwEif1L;%ZF5
zt*9MdKuvTP^?c|&6KERh_r9nv<g@rN6R6BB#6T=Xt+yLPbpMaj(0#pxRnVDl48h8D
z<4}R5*?unS?AoK=8;+WACMr|QP=UOS{qZ2`x!48fKThSMHaG+8vA(mMh9dj|b=Fr<
z3*N;5^j~Oxua3d=(=Z;Jp#mIc$0wjR@Di%%mS7`XiH-51HFA-ujb7;H@WabA<Pl6o
zuf=A8G>oO+9XsF@)J{IbJp36IP=nXado3}H{sh#5uV5Se6l-JECFbZFqc+%W3HeuJ
zC<7|OV$`)+f!aYS>ddyGit-Rv#lWTJAGhOBe-nCOQ+yr6@hjBX|Bib9ChEQNZ<wO3
zh8gs;-XQ;aVI%`}a5~n)tr&u5@e%wPL-8K!gA(!|-oZ4~L~o(yIgKjTUoZwkmYG_}
z#J2RiqBgh^b-g#bG?c;}s1L_c)R`YgeOSIlo#|!F#5<^+q%Jq9Y>wJtA5^i8z)1WI
zd*W48jWm1HY@h>Hr#}RBwC-~>w8K>xjoVQ>{Swpgn(arvWzIYeb!5+>0-cKraG4!1
z!wCBOPz#+$1$+|=&~F9*T82f~Rrmik4Mm){(qy6lH9?8(FS7kLn9leCY>9tiH*B=Z
zoaq95l>S!C!XHpYTH|f|XB-viT&#vGFkJV4Ck?%D65FHyYIBc!p#m9*I-+M#M=}Rh
z8;dXs*P@Q@V^q<8j(zY;)E6}U9kXCRRK_M^bDWNkv%YhbMop}=#uQ&NYQa3zr?oHY
zTD^q2hRadKb{%!L-tU_08-jYTJ!-r^>Q)t^0$q#=xE1yO1$_AL|2JtU^1!vG2EtL1
zH$a{BAoRs?sA`{rJ#Z8Hq3=4ga0qILvFL?qsLW>C@zIz{|5=R14eQ9iCOXbQe@t9&
z{)o)P*7P@`QgsIvdCms&XLb<Qp#L;#$1h@eT!``by6x{p)y#g(#haLonWg4aJf@WV
zH)CKs13CB)=IMcr{3m#viYk_WQ43WqGqsU`$@EiEN7n;AI0;qlOED8Sp=#kWY6HzS
znZL3H_&EKgE)7leHEJU7_e?<X7(;&;rr^ui2tPpW;4iFzb>BBfP#;y@O;7=JL|yBl
zSP@H50Zg^Oufr<z-4AI5(Ku=S0ae|9S}SZeI}b-qn24IN5mvz#w%-jkPd^OCQRs~>
z>b>dKrPhr`*Ev8#*X&Ew3xA*{x{dzmv&9&Kf%K!%gQ=)n(H^T~J|?1zNw^m4;we->
z<+qyWA3@!QWK7llZ$;x#28tgJ@OK;a!buFpOQ^u^*ztR)GY#Cv)x;5~lpjSM;diL_
zA7CT~Z#Sl*o@;~J*Z_=ReW#FyBAS7^m+#mI_M(dKD2CuA^ub%GO#F+=l>Y~&Ujy}A
zGHRa2sD-+sj%pz4S{7jgoQMzq{+H3vnO;L*yn$NiE<T3kcbI-QY6rQf%ydT&7TWPS
zsD<7}y}u2^a1U0-)2R2pN3C~j2l>|m_ZVn_nLEw>Ex~m9E3gutMy2v1YJt0`dmgaM
z98Cr)@GR6q%}@(>KxJqsYT;tkcjaZ&b6@Tv|5-FHF`$Jacbn^28`J1Nh1GEy#^IaR
zgV>P%RSd^kd(4iqP&?1X2yBI_g~6!j#-on<6|9EqT^g#^gLdFL)}imS*94M@Dyjjf
zK%U1)d;@FX2dITkTYp3S8TZ>~GLVS66-}+fur~d9r~urZG<2q?tXEMxxQ{9l?+;B4
zG_sCI?YtCq1eZ}8@ZWE~c$t_$e*|jb`KY7ZjehtWYTmz*qj8<O2h5o^MIAvW)OG8F
z0XWExk3j`C1r_jA^xzUy06S5&^dl;RH9j)8p$)3)`=V-OAgcI=Kh))~8Vy~i64dpX
zg-_rzR3Mj7MRyey`Tt>4Ogm@-8H<hR&p_?;5N6{YRL!IxGDp%KbLbbNHnJJ3u)edC
zh8KQ@+Szf`&M({kO;lihhfNVhqWbkQ7h9rsHVakl^X>1eP$}Prb@4+~W`4Iue@y<h
z^L8|1u@5SM=kXC-jJiha@ku;@n#lKvIjV-J_nM>Tc^Y+_ig7T$huTQ!C+7JWjHjQ9
z3bgYloWJhnU<Opplk9^FF^>LQ=)ps%FWF^G#6K|=BaWJWE7bdAQJI;8ns)`J;5PKZ
zAFv``wf#Sil7D^s?=YZ9<32SzPe)DkB&w)-qORFIR3N3+9hgA>5b6kjK?U|ZCS%lR
zW}a5o-l)JvVGDfGrJ+=Of(qaqdgB#T0KcM&?|~h!^0`TMIBF*esD<mG-b=^Y*bx13
zfbAEeGPe+&_{5>3$Bi5~KB>sF;M0^UTh^rv&WiR-EGR7W49fQm$uG<wpFhOIGoFDA
zO(@DASG2_^zi&W5T54K)YI?dSEi1cTgDqpm4J}u$;g+w8{@ZfFfP<k?Lkb6aCKi=U
iE*d|gVDK={gu{C#j~_95;;4cV2e(YzvSs)3;Qs;bghPe^

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index c7dfbcf7..b7a00e31 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "nie zainstalowane"
 msgid "installed"
 msgstr "zainstalowane"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statystyki"
 
@@ -48,9 +48,9 @@ msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Nieznany"
@@ -165,7 +165,7 @@ msgstr "Czy naprawdę chcesz usunąć tę domenę?"
 msgid "Do you really want to delete this user?"
 msgstr "Czy naprawdę chcesz usunąć tego użytkownika?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz usunąć półkę?"
 
@@ -283,7 +283,7 @@ msgstr "Główny urząd certyfikatu LDAP, Certyfikat lub Lokalizacja Klucza nie
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Ustawienia Bazy Danych nie są zapisywalne"
 
@@ -312,7 +312,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Database Configuration"
 msgstr "Konfiguracja bazy danych"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -357,7 +357,7 @@ msgstr "Edytuj użytkownika %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
@@ -393,7 +393,7 @@ msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
@@ -494,108 +494,112 @@ msgstr "nie skonfigurowane"
 msgid "Execution permissions missing"
 msgstr "Brak uprawnienia do wykonywania pliku"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Plik książki w wybranym formacie został usunięty"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub jest niedostępny"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s nie jest poprawną liczbą, pomijanie"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s nie jest prawidłowym językiem"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku '%(ext)s' nie jest dozwolone do wysłania na ten serwer"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do wysłania musi mieć rozszerzenie"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Format pliku %(ext)s dodany do %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "W identyfikatorach nie jest rozróżniana wielkość liter, nadpisywanie starego identyfikatora"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Błąd podczas edycji książki, sprawdź plik dziennika, aby uzyskać szczegółowe informacje"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Wysłana książka prawdopodobnie istnieje w bibliotece, rozważ zmianę przed przesłaniem nowej: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Nie można zapisać pliku %(filename)s w katalogu tymczasowym"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Nie udało się przenieść pliku okładki %(file)s:%(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Książka została pomyślnie umieszczona w zadaniach do konwersji %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
@@ -608,176 +612,176 @@ msgstr "Konfiguracja Google Drive nie została zakończona, spróbuj dezaktywowa
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Zwrotna domena nie jest zweryfikowana, proszę zweryfikowania domenę w konsoli deweloperskiej google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Nie znaleziono formatu %(format)s dla id książki: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Nie znaleziono %(format)s na Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nie znaleziono: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Wyślij do Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Ten e-mail został wysłany za pośrednictwem Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Testowy e-mail Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Testowy e-mail"
 
 # ???
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Zacznij korzystać z Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Rejestracja e-mail dla użytkownika: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konwertuj %(orig)s do %(format)s i wyślij do Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Wyślij %(format)s do Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Wyślij do Kindle"
 
 # ???
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Żądany plik nie mógł zostać odczytany. Może brakuje uprawnień?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Usuwanie folderu książki dla książki %(id)s nie powiodło się, ścieżka ma podfoldery: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Usuwanie książki %(id)s zakończyło się błędem: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Usuwanie książki %(id)s, ścieżka książki jest niepoprawna: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Zmiana nazwy tytułu z: „%(src)s” na „%(dest)s” zakończyła się błędem: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Zmiana nazwy pliku w ścieżce '%(src)s' na '%(dest)s' zakończyło się błędem: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Nie znaleziono pliku %(file)s na Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Nie znaleziono ścieżki do książki %(path)s na Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Nieprawidłowy format adresu e-mail"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Błąd przy pobieraniu okładki"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Błędny format okładki"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Nie udało się utworzyć ścieżki dla okładki"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Plik okładki nie jest poprawnym plikiem obrazu lub nie mógł zostać zapisany"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Jako plik okładki obsługiwane są tylko pliki jpg/jpeg/png/webp/bmp"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Jako plik okładki dopuszczalne są jedynie pliki jpg/jpeg"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Plik wykonywalny programu unrar nie znaleziony"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Błąd przy wykonywaniu unrar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Nieudane"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Rozpoczynanie"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Zakończone"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Aby uzyskać prawidłowy api_endpoint dla urządzenia Kobo, należy skorzystać z dostępu do calibre-web spoza localhost"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Konfiguracja Kobo"
 
@@ -787,7 +791,7 @@ msgstr "Konfiguracja Kobo"
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
@@ -853,7 +857,7 @@ msgid "{} Stars"
 msgstr "{} Gwiazdek"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -1072,41 +1076,46 @@ msgstr "Edytuj półkę"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Publiczna półka o nazwie '%(title)s' już istnieje."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Prywatna półka o nazwie '%(title)s' już istnieje."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Książka została usunięta"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: „%(name)s”"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna"
 
@@ -1187,14 +1196,14 @@ msgstr "Kategoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Szukaj"
 
@@ -1214,103 +1223,103 @@ msgstr "Lista formatów"
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status przeczytania = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 #, fuzzy
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "Błąd podczas wyszukiwania kolumn niestandardowych, proszę zrestartować Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Wiadomość e-mail z potwierdzeniem została wysłana na Twoje konto e-mail."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Nowe hasło zostało wysłane na Twój adres e-mail"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
@@ -1389,7 +1398,7 @@ msgstr "Wysyłanie"
 
 # ???
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Pobieranie"
@@ -1556,39 +1565,38 @@ msgstr "Szczegóły"
 msgid "Current version"
 msgstr "Bieżąca wersja"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "OK"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -1601,39 +1609,39 @@ msgid "In Library"
 msgstr "W Bibliotece"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sortuj książki według daty, najnowsze jako pierwsze"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sortuj książki według daty, najstarsze jako pierwsze"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sortuj tytuły w porządku alfabetycznym"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortuj tytuły w odwrotnym porządku alfabetycznym"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortuj według daty publikacji, najnowsze jako pierwsze"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortuj według daty publikacji, najstarsze jako pierwsze"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "zwiń"
 
@@ -2486,12 +2494,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Sortuj autorów w porządku alfabetycznym"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Posortuj autorów w odwrotnym porządku alfabetycznym"
 
@@ -2981,30 +2989,26 @@ msgstr "Od:"
 msgid "To:"
 msgstr "Do:"
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Usuń tą półkę"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Edytuj właściwości półki"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Ręczne porządkowanie książek"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Wyłączenie Zlecenie zmiany"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Włącz polecenie zmiany"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Półka zostanie usunięta dla wszystkich użytkowników"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Współdziel z wszystkimi"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index c6efe3c2bd789c787432ed2b1b4d82a3f36684a4..b38822b8a375274dcdcbde5efcd9f3815da8e8cf 100644
GIT binary patch
delta 10191
zcmYM&33yLe{>SkviO9Z7BxJKBf<zX3$Rd_15ez{iv9(R5jR`?%!%vHr39*f))><mG
zwrZp;T4lyIicu|7%S0_xOVMRe#;AFJa_;lYJpcK>&N;t(&-tG3`JOA!oWARH`;L>N
zHo#?>#eYhjEUO9b3RLg^|LGTNSxI!Wu^BqB4Q@a^e+mQej@`FfT2>VOaCE~o9D=<u
z7gu9vyoa5b&Ps^0tojTTVmcOM1KftrSc4(B8(G8p8a?n4`k+fI%ksiN48kbXbM5W%
zeAIJAc7Gaby|>VV^{x4J4a=%TJ-8lyaVIK(1E?1cp#u2|wd1R(=N_O3y0$hM@yDk0
z6VMw6qMjd#jd3D|VFf0$zV!hOcf5#t@CS6mN2q|D$hUUpj|^Ec7>$Ea3r)gctVI6L
z+Rp!Lh!-#ve?eFDjOV`?fPNT(4yC#+4ehKWY9~49g3qDKVWizJMKAhOF$(9P7N|nK
zw;z@IuTX*h8xt`y!2~t{yU?GG9q_XR@~_nX#DFHakGw-fmc{W}38<Y6!=X4H73g79
z3Ty5DBUB*%tQL-~QNQ;=J^#GjFGC;tmDmES63M?(bKHL58&qoVA_Z#sQTolXGx}oz
z>h}`Vf=f^fY{k)d5H(*+vbinssErLo1vCN!@Kx-Le{#^!ga^?Ne?Xn}Z|IL+DVCLq
z5y&xGqfi-JfZn(i+u=IY`)83Dtm~+w3gt)57lV2}6;%U$Fbf?+Xz0wAql)PO>Rw;N
z0Ib*EvbtgrYQll26c(TYEJjV}Kwm6JUE`Ig1ur16ST`{c!#Q}>RuV?){&%3E)Z}6W
zPCx~+2$jle)B<~K52F@3jSAoj>ZtBv9}Mqk<|{-k^d{>4w^18diYofG=&t*}nMM!;
zAEU0_5e&gosFdG86=Op_SISg6>bXMHj!Li*&c<L|jXH{5s7xM0ZSV@}nm<9!-+%(h
zVtp%;hEh5fHNiwAHP$>-Mm|6Va1>Q5zoK>))Ws|uiu$l5qf*`<8{!DtiKwHTi^{-C
zROU9LBb3G-8rsRXsK{@i7Jh_b*eKNmn1ZV2?x+c}Q45Yly;qDnni+P#0=3|KsGV;`
z9mOa1?|(@p|9bHo22|D8P^r0v)Su-<<tZZ_F%A2pj%opNL9F$tot;4ibOV*i|DYCj
z?`FOS!KlF7p#o0Fx(#$A|0=SP4CriM#CWVgRqf}fqxczP(2po&M-0aT+cJ!xzXEe`
zH|hx7)5#J>q5>;Mty6~D*!vC|T5vD+#G9xuQ`-!ai6N++6r&=34O`)SR1toPs)hZi
z9Uel>cM6r+-%%;|<s;&ajZq87VH0#@&`?DAs0HSrQe26RaV!1-kD{Jy(%mf71C_ZP
z)B?GvK*rd=7oyI5B5Iy8RBgPA3T!j-p2ONrgKSxcPyx8`S?Ytqs2z<$jlYaa>2y@;
zm!fKACpO2wp=#kSa>J~8J<L7tf|{p0Du8TMK>2k#ENdDKRsS;Viyz=nypIYbn{!dB
zDp3>c!bW(|?*G&7-$50nYcKQ3?u-msucHDzfYEpklkhQSu)Y=F+x%lO9+jFUs0B8l
zUi=*O!nc@#uFsgW?~TgL0MyRMpi({=b=D4hd;!*{zZPAv3gd7KI+ThtG&IpKs8l(#
zZ3^D<!Bp&r%D`MyU>ngL_o0gEDC%e~p;CVzRqYASnuWVzTl!h3`Ag9iXFSXKD<yLn
z&`vj@s{KpU1jkX4UqBV*Wz+}j0jdW4IIjknfSRxaw#II#osL6y9FKZ#DmvjzR6w)(
zl7FSVnt@h$5EJnyjKZjX6b@!0A46+4>YjgzTA&sc_*GQEk5LPFWSgS&#%A=BQS;<t
z0xm~o_Nar#AQ~?H%?D>Fl0B;&bMXu+z&1JN%)4O}{a&_(s0_|UAN&wigu5{lZ=*Jp
zFu;5lMxr*b!0tP?(ohYYM+(w<fZA!dfqdm~Dr%=6p&QnqH||4UJZ^i@{{1#KXZ$|u
zR)w)UFHArkMJg)Lp2+VGYcLIe23|rxe9i8cqh45znrIVx;9k_ihfx!sMV<XsRE^xS
zeQN(6^at}?G^%(LP_@vzZk+Sap`jg)KrJvDJ@FOP3sX@GE=Db|4)w3%CwBj9)EWPP
z%8<uk^IRb6xt17%Ss05&s0=MZPu>4dX=n$3MP=d`aucnK*c)36F#!~#s((5LVkK%P
zTQCT#Q5iXkO7R)g^Vd+%|BhNGfWp!dhN43Qu{5;f1k?mwP&?_3dT;<LGX-{k9O`IZ
zMQ3~iJL4Qw?R<#}>_4b^oQ9eVd!hpJLtX1uLpgsfkjQ{ioMzh}wSxjwfW>xy5-Px1
zsP`7xzpp`E-;J1zr%<VP9%lZQj6f}%iJCVL_5COsM*g+HTn4nGg{TFVV=z{sj^qne
zivNx&cny`YM#IfnHb?EW59&)f2$k|bVhGN%U5T2n8kM0#4twAPYJy9sOx!>P@DLlK
z?{g;d7N`l@VHEa41y+b!unhJ5BGkfFsO!DY?w`j-^nXRo<M7Ng3x%U5YKQuv4{D-3
z)J`X$0-TP@*jpHf3v55dw)8LC`j0SwmS<v9#*0u#v;g(qXBegXe}zU%2AuQF#BES1
zPO<xis52XnDw^r2Vw{CaVTIj)2Nl>lR0cPrzKow?3p|h7m{nkkHUM2%-wLj4kS5du
zQK%iqpgu^+n1)%X-`~UloQsLL5*6@q)R9>u&20!l72`nE&Szr;?!Y8Gi7gy7tWjp-
z7}U<%pd#&P+XuCyJlmI1fxT|`=c58yh04eYRL0Jr-n)j%%smXl#~6;mqsf0`8trJP
z>Ia~TBOmp`6pX^@s0r6#ByO|&Cr~@Qh&n>wG3LEa*o1yM>Y9$gSS-T9xCFJ{^)cjM
z5#M7#srxVLg}|{U1JS4|PC;GIzNmnQpg!3X?BA!@R@hdd0^Wxz+7qawJBwQHqCI|X
zEcsWe?=Ya$KSiCb$Ma^va8$L%qFx+`nrJvGl_Sv^UqfYJ2FBnf)I29q8@i0TT|Z%G
zba}yyr#Wb7XZ_Fxb5W7!*$)(<j$$h6%=NsUTV%To6~GEq0BcZZdjz*QS=PTWo&MsN
z%wI-dql)zjHbqC$I1|}mY{tMi)LAV+Wuyj+aX-F-2}S0AyIF~y=%2>===rkw-}(Ge
z{X%rZVpK+^U{_p?%FKD>XdTua)3E9@yA}?|H0+5w``M_}t+L&TTHr7$Q^!$9aRF8B
z4^RuZ61AQSMIBuv>bY3k?iir^pHD+CmS7v4iLG%PD&^-;MRyCM&~>~?bu9LvKLEAU
zWvD>cpchu7YHL60OL`jP@CGXN0e|EJ#rjrz8j&~@yWy*-NNX?@PoZ{l3%&7Y^u^y%
zJM$?q*ESfna9dQ(bVc2&EW7_4DxlG*BPqqY`@e#Q9|NDDGH?W2;XQ1NkrPbS=3oZ>
zd8o5IhFYk>L=%t?CeV+t%|;zz8NP{sMtuQ8O3j8ll#+i9<T4;9V@o}VQTT;DUW?K6
zpI`t+PBI^!Wb~l_0_wdIQ~=9ukD^lj8~S6|Wb<4bjG{keGWplSQy7?u%TQ+-JjF~D
ziCUmPss@H*AWp_yoQKWvd(@Y+{;Oue2-NeL*c<av8QX};*cJ4_n+_V8G#;XkpvzS1
z0sErP_zl#jbTR5|x1(O%i~aBz>Vpz8%>+CU<LS@D5ZsP~@i6MW#;=)mTA?=LNTuOU
zBL`Jn!!a8RF$in0FCMe|!LOSgv__>m8I|JEsM?v0Nw^c0$*ZV^Z=)7`j5<Q!vby;l
zR#O@(wvIRq$DqDodr?(?4n6S_Dg!^FCVq$tyxw$kmY%5bHmD<QkD7Nd>N-1Yx1f&T
z9~i3pUrQsHfrqFf^PORKo`g;4_d<Oc$D$T|8}-~`RBEeHJ9A^M7T5&!A?uDEu?Urs
z^{86;78SrF4ClXfm8aB2%rs}y7q!3$Y>YFo5w1X`t{Qc=hcN<cF$$lc-ivs{ER=zI
z{{>X_zk$l&Qq(+a(V?@crqK}pg6e;VD!%KeqWlf@q8pc3{f4OLV=xrEq6_BQ<9Vo~
zoPf&gG3<$#QJIRJWo|?2Eb^~NrZS)f%TWQWL`D1|Hp9<R*YJB(k^YE!?-8m-yk?se
z2Ve^Q9@qh=VpH5<_fMma#C?uA+RQoRUuRsvKn%W)BXB)7!>8CEo4sXrJ`oe?&q5u^
zF6@aXunz{lZGO*39Zdyl$J<cr9I$_{MQzB}G1sIn3^fpmTCf!=#nVtlx6uB5xjp_q
z>TLI5DxO6x6fn;|8VsY~6-VPx)N{Mh9q*$nI-b%{>Rtb2{xJzg1rmWeia3nMPN;yM
zL!D^}>b<vd99E)=vR*j_hoPvWa-fcK0qXttuqD<Y8FE;)G~yU|f;!XK`Q}=6K~1m_
zwX@Zz1$Ux$egI?epZ4!A3;3&vej|JyC*g2BhYBpE!UWP6bu{@{_wRohjYtL-VmI7@
z*?0$sVCq71y%wYH@yD2f*Kh!~SY+<~6jWwbp;BLs%G^oJz@KpdCM`Cpe-i_A|L4*0
z!&TS-x1l1gLGAPeI^#`r!8_Ovf5j+_U1HvU2EFMI$3a+#+Q=SMrregAjkZO9`Z?%O
z#G`4nz^T|5*PyEZ7S>0fKbybxf=~-&qXNmpSR924crI!qYf)#t6IEnKP#HOi`d-{b
zWyX0K=kG?N#WM3?0;bS!j~X9`nsB1spM_d@K0bqsQ5iaq{qO+}!K`=8-v`T4890ua
z7*=V%2P3eq`YXx5B72Jg-RE`agnO_Reu1s=25O?9cg-KCV^9mOLskD>OvYi$&Hq|n
zjwSRjVIU4zVKVtV#?voCW$s-E4V}$?48iM|flpC8%vi~8a2|HT6WA18SD8OP<FGmX
z@z@`iVj5n-RE%D27S2aybSx^Pub^tcF`b4MUWo3v3ESdM48qH(7apJ&HdtfEgHZ3q
zq0ThZ9?wJVxCB+qvr+HQM+LANHE$IL=>G4e;mg2D)I_zm53wQrfcMO`YKc+w(@_(S
zLOnkLRTJf?02iSLuEt2*j6QhO?*9W@(*F%ZSl^0TYyMZOPN)}4Q4!9-Cb$&!!bhkx
zJBKRLdh1Le?NK}Jh3v@ckArYD>Nf4dFtpa2c^YG5x;;>TGgzZ&Xu)x)oz1Xah`NSr
zF&Gb`7P^3%@G9zh{*KC&%LX$~80rYxqK+sFwXr<g7i}k?!<iq-XmrDwn1=gM3q3)d
zS^f9Tb@9PS`VCRz?NI@z+2)`!FbY*%rKsoTpf*r}I_iz6BdK|x{Hy2=GSCB0;<FgI
z(cFpxOr}2vweV-C1-?UF%O6qqIHbzdLIi5zPN<zfYxl>XGBydbaG^c^O%?gqS^kRw
zMHafr{P`V+O5sS<i>25IE9~)2=t+Ms>MW0-itj3F;h#~(>9*O_P*YR}(oyr}VggQZ
z&}dF$E$W3ss0lA&1U|-=81{h~&q9rlL`^gUV{kbt!2PHI&S5zIg35^RhbF*iY(PH&
zyQ8B6jZ7NTuov#Nb=qS7k?Di6jL$%Q7pkx`o<#-bx7GZ`(;4g2FTxI3f^N78z3?N{
z!e5{=eF!~u|Ig6yV&F2m;$2j6+(+%qWt;i?pfzfTL(mz=qdQJSy;p`>U>0hDa#XFX
z#GbevUGN@y<0DMe{co_{?6eaqrNyXXoQvA&3Diy->@fc(Bw`o(d8p!i2et6u&=<c(
zo%LnA{}6RO-9EC56m{J@p&#p8*)%$00V)&kpo(t;>cLNuR9VNd8GeU4lK-MI)O@Eo
z<G$FMem-i4^RPWuq5?XB`ZwenDxmO>$$vVH6dLWY6qU-&s3O~e{&*4-@p~*l|7sIZ
z32NtM7=^P@3va|gtVSK#5!6wAk1Fn4sM>JdMgCQ#zPrqV@u(x{hkCIP{ct8~g2ku>
zSE44^fPuIbJ#aq;;8*tVwU|Kvy8U}_jd?#Bb?f44$iIrIKLhbN$aW^`8f{0N>0u1Q
zv#8thBPy`?PfTEGsN#ACHJ*(=Sbz$+7#rebyI+oaeraPG3gBH-0IM(>kKxja*zoFU
uu{p`rw}+Q|c_+swCdDUqh)QbLB{8LX_KRJe>UFL@@KRWMwfE+pzW)QGtVBZq

delta 10293
zcmYM&33N}_+Q;#eh>(zoOomAOL&OjvgL#NKAsRzWMGZleHWF7v)GbF1FI5^EF;u0k
z(iBxgOfBA)P}Noq#ntM%t@&z|m%6>$s^0I<-fO*GUH7y1{-3k=v!DI!L+|aMz0cn9
zcK;ddQ{wQ?bZ^J0hX+H{`~QEQY3w+ObVp%BEW+kkj(YwF48}igKd6c0c<9GtRqTgD
za2O87ZP*@tnmSH9$8nt$8kHF+#4b1+tKcE5gvYQJo<P=cE~7vCHFKOm48`i$5JNEm
z^;|DIJ_YsMEZct>wcaZ9XMN|5Ck@9bLp`_)Yv5s20B2AyoJR$63AN*2P|x|snSjDk
z8HvUQn1TVAg?c^@BXAzp#ZpXSedj|Oes~-8;IF9E`H^P@6pY$gH1d<v2BUEtYM})f
zj%CQd&j0d1VfYi)L9cj%#0ad04KN5>psQ4Op`o3np+Am6AAAl~4tcgeAFI<}j2<jO
zEwC5$-f2|oFQEdh)Pm!{mZ-qSVh3D?ZSb=e<X@@%ivdkgxg~{zLC7&XDX5)H!eKZE
z73c+23h&syAFC*kXpF>;sNaX9o}X^}OEHjs88*Vb3FKd?`OZFY6_wh@NTE6&N<Rks
zU`@<L{XQ49;0DwJ2QdrJq2_CoWNu4m)W)(<0p(yYF2eTsx=TY7p2Hyg6?N8ClFfqk
zup9jrs1!~`Wo$hL;5*m~ccR|EfyCha2X$0U`BC$=K|S9WRRhDZ2fEobbY`1T#dHQ$
z#SbtTYqoZrP8frlFbkE!T&#(+Q4<zn4P1x1##>Pf{)EKh{DvVI&%vv<x?z3Y|5O@E
z%|wjCmr#Mcg-T@wYJtzK7f=gbK?QIhbyPlWIVOxp%~yz8=rz>)t5F+x2UYYt&`<Y&
zKaEfZj-amHKd=`5fJ*s8R53Q<bEQo6M?F`F+R<FBjVm!6x1o;WC@PcZQ32gYUGo4A
zUh~(&9<1-Qq@k4Nqb8V#q{dl`%E*VP04}0x#k+&qSq#>u-xT#>>5fYIXbi&~>pav^
zu0dsBD=KsQ(XB({a~j&oHB{seQ49NZG?6z!1=s^s&6%hPMxhqWL%lZ}bu_Qqekp3f
z?Wmm}L><Ma_V=?L$-iE_%7Ci+0V*}WBlYJ5Q+dir8m8cA)KRTRE{d}YwX^G}fF7a(
z_3vyJu7mm>#G(T4i3+$sKG{HL@~<MxV?bv+1LLt2RkdHDjzX))g2$SMk@Rz|OEHT6
z7VM8FP)AUwi{oTqOH^R9QR^&4ZEUwoLkoU^z3?~Gm#IrvlZk9p3TLAtUV_c=4O9^x
zM^*W0)DF+1=KBGa*+4!XN_l+@z&O;x?Xe!Z1869sDX0ZXP$@3M2t0^`@FMED=H1Og
zgHf3qgIZuBDv)XR_d?W}&qK|#6jdAVp#s~FyyrS6Xpk-EJSu=tK1+Qt7PX_PsPVs}
zQo0P4`gc&Zau{Rq8&oYkMsAu@v!}V|>8N=!Q2~rX1vKS}uH(E+L)E_t`{IW<3@dXU
z3S<;2Rb{9Nj-syJIoto)_Wwi`Wq7LjWcNXaoL5kRp229mg^5@#&2hT2zSEgTL!5(3
z%?8v0<)|0GM7?kgyJC26bN0hfnHh`P`7~6@7oyI($d0ea%Jg@j5AMaLcmQ3c;yMjY
z<i&QCst}~`oha;x&!94}1{K&I^uw=E#dHyMG<Q*{ubghGJq5LJ2DZdO=#TT!7hg^1
z{FRat2DH<CsA@ljx-Q?LCin?el=n~{EMLw^HQ>Q2n1Y%x72_}iwbK_+fzClaw-~)~
zIVzyyzT{siuVA1Vp2GzE3q6?d6rWWbh<p^Cl^BJmPz&5a1^x>v;A$CWfw~w&KN5Ac
z-BI&Q#1^<2mD!6fjZ7M${mcjFStN_jIvk4EQ2}=9Z_YdeJ@kiK3sD(dgMs)Fst8YD
zH++QJP|5)FUC2XiV7=|T2WhAVenbk>@f~P(nt^TUFGlV36Re8IFaW>88u*>{w*CDP
zYUh>Nm2Oottd1$Dqv(qYbcp%gbtcfL$-qnu!X>u94)ww|)I|HxAHP5?d;vA_4b<8H
zf~t|<tu^>+>Gv3GBC2>(P_;1Z$vEdfhK6>SgIeHkSPfr9y|5Uy;M=GLc4A%p)b=l<
z&iGeUhUyMB&ox9n*A8QG5H`kHs0?kuYP$c&X=n#uqcZU=awDDFn1-!~m;h#@s(%@V
zU>RyB2QU;XP&>YeO7V5n^AAwZ2U1X4rvd5+o1&|MwluWk6x0OisGST$JvbJXnOxg{
z0d+KsuoAAo_E>_tC8tn<`42Pm1fwz>feOfjy4D?rasRbIR|b^ge%8^b9ps_{oNfCH
zPyrUB-h0db{sHRx?!hGd0hRiYr_J9bTc8#mh?@6#)c0f7)8t<ZtYJVqdK0z4W(>!@
zs3SRvO7ZuYj1N#5YckxNWh+$1hNHfe<4`Ggu@)9vx1wsL0yXbVJ)l(mW(T}Rn2ADA
z8L5W~q&bFR57Z8Zqb8Vy9-M^=a2;yl9jNDzq5}99b<OYFe&9$`+-@ulP1FUo&_L8g
zlkE6x)I>$79dAPIbSElvA7N8GZ2bva(hqya*bAG`FTe&^iaM&p$a}7Hn}&yh@KNT$
zwy256qEh{=?XN@ad;_X@cA|=MA1Z@KZ2xoA`{z*^{0{Ynyp4@8aJ1QQE3Cx&PAUym
zXS%gNYJtJ19gjeLm?mNh7NUONi@|sh6Yvx&U}ucUWGie>w=b$F7ov8)AEWRpCb~4d
z$C}7mp(Y-I+Sypt(L8URjoML>^-WY@+im|7R3N8O8S%<88S_KER~wa?CRi6+q8mvg
zokj#sLRJ3)tc@#BFKj^%?nE8IS*(wjZQpC0*<ldstb3r|%fWh>kGihQu`!n7VEl9(
z`PYIG<4wd(P(_%4dLa#!fgz|Wein62T~xp?qmFKq{e6q|i1k}k!1qx_>ovh-*dLXl
zpb6w(Kh$PG3q_++pNu-&6x4zPQB^(?_2NR*Q7uEIvKTAj2dE6}!dSe7n#ViaY$yzM
zyBeZuqn&Gin1)(tF8bgSROChW_fk|!-$$K!IqJEi))S}zzCs0X7In0L;8t(GeiO}q
zmLHpB{)SX}vME+Kkwya^%tl4F7#rex)L9)yW#kr4!3UUw<DN7BAI>RkN8k5(laVgS
zpEph~+h2#u@Y|@2Y{5==2FZ-;1Tve>Hrm=AweUbp!58fKepG;`t=F+K{ohfUQgk|s
z8mMY-hDv=0)N>iAqZ@>JZsZd={~0v&;0n}>8?ia=#yGr;N_jx8DY_{1(C>gs^+@cA
z3s5^ffeQ32R>zyD+IoQclKSSETB?T)bpKOnMB`-CwR#0R<5pCpx3CWSOf@@+!T|a)
zSOb$#JL`_Rw&|#a$D?XyD(Y4h+WxDkfJ)HSnUvAcb@~c}@JCbz{=jC~<ZtF%J_uE{
z^RX))LY?Jf)IuGnnSi=u3;LPXmrzH%1Lxsqs4rmOe9m7xelFh(EU|7zrS>!Q;5|DY
zJl$j}5rY{Ygh@CNRitZC?`=c{aMJn+RpfC6X6OA-&y6i0{~j7IGoXmJ;9NX`I?MDK
zW}-o;1?HhLwG2aWGY-W=7=xjO<_OxO7R*FFUw~=20+q3EP#Ft%XPWAb#BK~UM;$>f
zwnqJ~Gv0&xlpaH!?G+5fyZ977MjcJx7fiqlF`oWztc6!_F#e8uum3Ewjysx$c9MsF
zI3HD9%P<4iVJP0hzWCVo)BkREFb0+CiKrcyplWA7CgOEeCTqQD7WSalYl$48>-3<Z
z1%{%E?Rk6}SE0UOcTx8@V7B?=I0Th}`lyMUqXKV@9_(Vr$D)pOGHTw%sOwyA{T_W;
z->EjoT(4jZ=Yi%JjXh9-Wn(>@h59nCMlE;%_1rO3YHy-;)`>YA;Q-W!YzDT)QdCAR
zplYS+Tmqo&#M6kxR;bivqH4fJEwCITa2M9buTa&06Lq$~V-yCzWHOM5dM^{T&~()M
zYq2KoL1pkbx|--54Hd;r48vb-zdDyy#TS7JC=T^vC)@9XdVU1f!KvtjOYC?N>L@p%
zGW!^NVc2|=sgd)^e<ud=7*HVZqZa%a70@YE#Q(&G_<yKt7`ng|X?@gt@u(W<ib`=R
zCgV(OgYRPlylVTt3(b*qUP%6Rwgn8x*HB-??f48{KrNj7Km5lD4nt+)T};4zs3Z9o
z_Cl{k=0D%lP`|H09nBF`ZCpmJ^Kbimu)Emos0aG+LqFRegj#SkD#hDSMOR^eKWWD=
zqR#dXc0~V|%|fa8<Y=%i<5MvUUqL<hGy0+1bcwmg$*9zKz$%!I{+Nk6icuJiIjD(W
zMV;wJ)O!bTGJb(7%GR%Nb1(z-Jt;>W<zdwOUt<&9|64SkRPR#r$6_MtOh=-wRW53R
z3RDWupccH2+WEgR7HcjuzqiAY^q;~B_#O_&fLBdm&!PfxF-rG;1r05@1M6c2cE+oi
zfzd_gZ!~%6p??fjWH+!Y)?UtC$Klurx1cg}8kPE+sLXk<Fwe)}0Q%YZ<o@rap#TnH
z5S~UI!DUn`Z=rVT^_uxRUL>kkqOldmq6bH!-hUATa2aOeI@Ct)pfc5|*lct>x-}V?
zPeT!xpmy*+_QkWP>W^A!u2*+#N53~}ftOH$6k%gri3<22Dv)!iv%ZeL_y;N@-X-RH
z5m`e1m72B;RK?+_2ghMDPPXIgQ4_vv`}<G}e}cX77%D@7tIVH<&2R|)LQKMws0=u(
z&7ZRUP~U^)t2uuySk8bV`v`TP&!acq!De_5<FMWuGf{6$p}z{B!t<!=Z?M)ZxD*G`
z{}`uY$m^y!7hq-jYcL*5T^dT=m#DLOfVD7Uohg=N)DEX(4?KkJ(CZDegAUk}{wR#W
z4cHHlqXG<HZ|?gL)WR!JnO=>`sQVTT)xb{F!WF0w!zFBq*D(~sO3e$+usZ#YsPW#Y
z_eNnIEU@E67(#y|s+jkq7W@Piz!~Iy*ZG!4Favk72713~|2Vcb$1uiIF&v*k59XsL
zT!~tE6RIXYMg@2j{qYRe$L}x@AK8AjxAXyWIaeCm!C>rwIj9%QP&?d(_3$`0!E2}^
z3wYZUX=_v<lTkaJh1$?O%)}DZZTc71#a0{4JpD0(^_`hCl#-RG1=ph{+-0pmUBh#z
z3_L_FRO1~pVJ+0zCZRIb4mD3d)DetFZLkovu_Ej1=xSgSjY_x!JL7Il!TYF%5;vLv
z+oNtvcdU<n?D%9<z|*YrQ5jf?s;x5A20uh?;0Wrdzu8FsbtbnMP|-cap6I=aKY%a|
zbt_)OB>WJy@NLur)!#MOvOX%XzNlKrL@k_y+W8#YUxhk?_pk?6yi5M|V3jg+mUU2(
zWngO@g-T&D>cujwjYlvMFWKJ%-ZOtWjm8MZ<55M}2Nl3jRA9NNT3U?C#3q-9CO(KQ
z@E;h1zMIVpai|G<VH9Rz6P#<uH{0=JsClkoEdGTGG<J&#pbJLQABNg+0V+Uu5sfM|
zR$_O21H0k(n2OO`jgzny{q5Kouc5vV)!#S&;n4{d*bGd-H?cCF#x{5Xt75=5vv4@F
zuIn_Up_IpAHSA~~NJC%xgHbgy61B7Euqm!U?eG9r!gJ_{7g6tBL2c|7YW{nun(_L;
z{8cR!eRTgv&<Nm%F{sF=pmth{O6k|AqP&CcF?qY$=@e{6e-(DX!>A&Cgj%@e4zqAu
z)LEz5{%F)S&BZ#b?<}C9`&x=YSdMM+C|1Wus3P>+X`YKjWhx09VhZX=#-TE_1Z(0>
zjKd1l2JfPZ`cG6q$-BtE{xC_Wp@`;V7hH?Vz&EH=29}%R3&Wc9TVVpG;%F>H1#|(m
z^DF4VA5jZe+if;b2X$oesG~~VP5xEg0~k<o<e;jw09Eb9s3X{gdhsL%;SJOT|3NM2
zwa2{ghavQX(H~<m7!&R9J+TG-4Ey_wd&s{gSj2#?T@k97c4Iv5x86YA<Iuh4Oq*jU
z{Z6RcG7uG5F)FZ)=z|~F@p25Le-yRe*BFME;_SdZ)C<3%0(guHz<Zzh%VPo-&uJW4
zKDlxKq$p3}<eVJOxNOga?40cB*%Ley^QL*S7%Irmo|a#}Yxs)l0g3U6N%2WZp2YSY
z655mxnApkNt6llBNp-s<b@OEBPtVGop6%i3inl%4Gsou?RBW4&<(Zl_Ez2`KZ$e(a
bhkpz53o728HaRcfDZV!&wERF>VvYX-nJ;Pv

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 762d185f..03816c54 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -23,7 +23,7 @@ msgstr "não instalado"
 msgid "installed"
 msgstr "instalado"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Estatística"
 
@@ -43,9 +43,9 @@ msgstr "Reconexão bem-sucedida"
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Desconhecido"
@@ -159,7 +159,7 @@ msgstr "Você realmente quer excluir este domínio?"
 msgid "Do you really want to delete this user?"
 msgstr "Você realmente quer excluir este usuário?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Tem certeza que quer apagar essa estante?"
 
@@ -281,7 +281,7 @@ msgstr "LDAP CACertificate, Certificados ou chave de localização não é váli
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "O banco de dados de configurações não é gravável"
 
@@ -311,7 +311,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Database Configuration"
 msgstr "Configuração das Características"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Por favor, preencha todos os campos!"
 
@@ -356,7 +356,7 @@ msgstr "Editar usuário %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Usuário '%(nick)s' atualizado"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
 
@@ -391,7 +391,7 @@ msgstr "Atualização das configurações do servidor de e-mail"
 msgid "Password for user %(user)s reset"
 msgstr "Senha para redefinição do usuário %(user)s"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
 
@@ -491,108 +491,112 @@ msgstr "não configurado"
 msgid "Execution permissions missing"
 msgstr "Faltam as permissões de execução"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "A coluna personalizada No.%(column)d não existe no banco de dados do calibre"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Formato do Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Livro Eliminado com Sucesso"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oops! O título do livro seleccionado não está disponível. O arquivo não existe ou não é acessível"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "editar metadados"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s não é um idioma válido"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "A extensão de arquivo '%(ext)s' não pode ser enviada para este servidor"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "O arquivo a ser carregado deve ter uma extensão"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Falha ao criar o caminho %(path)s (Permission denied)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Falha ao armazenar o arquivo %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erro de banco de dados: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Formato de arquivo %(ext)s adicionado a %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Os identificadores não são sensíveis a maiúsculas ou minúsculas, mas sim a maiúsculas e minúsculas"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadados atualizados com sucesso"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Livro de edição de erros, por favor verifique o ficheiro de registo para mais detalhes"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "O livro carregado provavelmente existe na biblioteca, considere mudar antes de carregar novo: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "O arquivo %(filename)s não pôde ser salvo no diretório temporário"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Falha ao mover arquivo de capa  %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Arquivo %(file)s enviado"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Falta o formato de origem ou destino para a conversão"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Livro enfileirado com sucesso para conversão em %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocorreu um erro ao converter este livro: %(res)s"
@@ -605,175 +609,175 @@ msgstr "Configuração do Google Drive não concluída, tente desativar e ativar
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "O domínio Callback não é verificado, por favor siga os passos para verificar o domínio no console do desenvolvedor do google"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "Formato %(format)s não encontrado para o id do livro: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s não encontrado no Google Drive:  %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s não encontrado: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Enviar para Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Este e-mail foi enviado via Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "E-mail de teste do Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "E-mail de teste"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Comece a usar o calibre-web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "E-mail de registro do usuário: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Converta %(orig)s em %(format)s e envie para o Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Envie  %(format)s para o Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Enviar para Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "O arquivo solicitado não pôde ser lido. Talvez permissões erradas?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "A exclusão da pasta de livros do livro %(id)s falhou, o caminho tem subpastas: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Falha ao excluir livro %(id)s: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Excluindo livro %(id)s, caminho do livro inválido: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renomear título de: '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Renomear arquivo no caminho '%(src)s' para '%(dest)s' falhou com o erro: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Arquivo %(file)s não encontrado no Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Encontrado uma conta existente para este endereço de e-mail."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Este nome de usuário já está registrado"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Formato de endereço de e-mail inválido"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Erro ao Baixar a capa"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Erro de Formato da Capa"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Falha em criar caminho para a capa"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "O arquivo de capa não é um arquivo de imagem válido, ou não pôde ser armazenado"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Apenas ficheiros jpg/jpeg/png/webp/bmp são suportados como arquivos de capa"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Apenas arquivos jpg/jpeg são suportados como arquivos de capa"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar arquivo binário não encontrado"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Erro excecutando UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Aguardando"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Falha"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Iniciado em"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Concluído"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Status Desconhecido"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, acesse o calibre-web de um host não local para obter um api_endpoint válido para o dispositivo kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Configuração Kobo"
 
@@ -782,7 +786,7 @@ msgstr "Configuração Kobo"
 msgid "Register with %(provider)s"
 msgstr "Registre-se com %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "agora você está logado como: '%(nickname)s'"
@@ -848,7 +852,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Login"
 
@@ -1067,41 +1071,46 @@ msgstr "Editar uma estante"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s criada"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s alterada"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Houve um erro"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante pública com o nome '%(title)s' ."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Já existe uma estante privada com o nome'%(title)s' ."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Livro Eliminado com Sucesso"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Alterar ordem da Estante: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erro ao abrir estante. A estante não existe ou não está acessível"
 
@@ -1182,14 +1191,14 @@ msgstr "Categoria: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Pesquisa Avançada"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Pesquisa"
 
@@ -1209,102 +1218,102 @@ msgstr "Lista de formatos de arquivo"
 msgid "Tasks"
 msgstr "Tarefas"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publicado depois de "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Avaliação <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Avaliação >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Status de leitura  = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Ups! Ocorreu um erro ao enviar este livro: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Por favor, atualize seu perfil com um endereço de e-mail válido para Kindle."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registe-se"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Seu e-mail não tem permissão para registrar"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Não é possível ativar a autenticação LDAP"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Não foi possível fazer o login: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Nome de usuário ou senha incorretos"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Nova senha foi enviada para seu endereço de e-mail"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Você agora está logado como: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s's"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Perfil atualizado"
 
@@ -1381,7 +1390,7 @@ msgid "Upload"
 msgstr "Upload"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Baixar"
@@ -1548,39 +1557,38 @@ msgstr "Detalhes"
 msgid "Current version"
 msgstr "Versão atual"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Verificar Atualizações"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Realizar Atualizações"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Tem a certeza que quer recomeçar?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Tens a certeza que queres fechar?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Atualizando, por favor, não recarregue esta página"
 
@@ -1593,39 +1601,39 @@ msgid "In Library"
 msgstr "Na Biblioteca"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Classificar de acordo com a data do livro, o mais recente primeiro"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Classificar de acordo com a data do livro, o mais antigo primeiro"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Classificar título em ordem alfabética"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Classificar título em ordem alfabética inversa"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Classificar de acordo com a data de publicação, o mais novo primeiro"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Classificar de acordo com a data de publicação, primeiro mais antigo"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "reduzir"
 
@@ -2470,12 +2478,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Ordenar os autores em ordem alfabética inversa"
 
@@ -2964,30 +2972,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Excluir esta estante"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Editar as propriedades da estante"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Organizar os livros manualmente"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Desativar ordem de modificação"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Habilitar ordem de modificação"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "A estante será excluída para todos os usuários"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Partilhar com Todos"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 69d9e91fa593d79d7386beda5873cec19f1012b2..42feeb5a438f21f55d119e38b645bc7e3a260415 100644
GIT binary patch
delta 8367
zcmYM(30&9p9mnx6h>9Ev2p-6-Tw>gzA}E3gD4^x7%QG`IMYEY_KaaF6Z!?FH+7xe_
zC6wCcI%ZN+mvgyQGc(hzvT}AUYtFsie!q{$di2=y`~4l?<Ma7^e}A@p{Jrnl?|i+B
zVSY~={_*uSCJMWSsQ3SW3gV2(qFadFum<(qvlxcQT>mukulbDs@W+67V}@Z{9F9}5
zC%%R~@JDQJjAwEZjOoLLp4bxSV>4We?QsPr<5mp7H!%p$VmN;2?tksBM|QUNlaUEb
zF6zB}XDPO(KN#CEzZplP85e3$FU&zrJRh~g4cG?jQ3ExiBJe6Qr@4T^cpLS6a2I1b
zVH{>-0k*;#)cyIWg|Egm<~P5lK{U)6)PUDfp$<zlrX%*j7B~u(o$;th&Bi+mML+r*
zuq|$O{r#v&9YQVqcc@4<VH#dXFOx>6Bs*ax=F^{#dDw`}@fzNRH!u}r86^TMPzxA`
zk@%?VZ$vG8KStvTcmJ}xf6MhFQi#8Dk(pw5*atOGe+<P5sL0Gg4fr%_!b3O#o3I6@
zvMQo)GEqAniW+AeD&z}L#kU4EUK1*kpQRFiP4pud`eIO58;NSv&KII`yA*SA9qPps
zs8ews72=k}Q#lPsJ)eq!*d5udDM6)nI;wWoqTV~;(NF}Aq88GGf%rbE=&oW8euv6&
zDuoe?=@^66sDWpoBC#Iz{;!-nQR5s!jsGetGJi&m=Y2s#FWkT&yoD_>fP}ZgF!aYL
zROl0tM@*r+J`FYC9Mtn`QP0(43BG{Z;J4Tgo2A<gL?RpTOg;_eWE5&e3$X((K^>zl
z7>qBWitZ1noW74*@E53^-9*($V1`XmA}T_8s09wg);J3T(8E?b|4-6TPB)=)z6+J>
z1K1lcp>i9`QPFwMMJ-?oYT^Z`fmfpzREL^iue;xXO3j<7S~!hL>9-iG^PiGs3@6K!
zJ8MwKX0x*qwUcu=2ydVw(U;X!;Rw_McA+L{M1}eS5_R(pmSQ}!CgK!Siq@c~74M=E
ziieScHYZRyzm7`D52zj8LJjCoctS7_RXb&<6b(U5JONeZ^H2+V8a4iL499m+slAd*
z{D;smciRVtq9$5|3fU8=3D%+(@{GH`9aU`mQ3ExiCOGTvUv~X3Q9HejVc4Fpntpt`
zqKbS{9`V<N)49+F=b{E&>D+;B>Hi+JqjRX|uA_?dw(EE3Zu==nv`t^s_v8`Ohv{Wh
z#6Cd1cMaR4pT}}Yr-{NMtVV@?9co9lsFm+W?f5t<)J^XCc~sGUii*%zn2O(^HWJNe
zPvi7NZFC?O;&AMR-X<E_*;(v>U!o>zk#BPuf)VtSkugmns@UeDCSHLY5VHz3!EaHi
zJBd2hXHYx6j;ghm%&Papv7^p^XBw*ZLR3!1paz(PX*dnFv(2c5)uEo-g}(SaY5^~x
zLVO9k;th<$r~+e(u@G5<S%NxEzePWt{|{(rMIWIC{0h6^4OH&h5ibppkLkD=@5O`2
zfiSnR0(1CS4A*^B3g5*z{17$%e^Ip&+{e~N5oR*KSw=(0ssUs0W7juDHizlhpX&oq
zJJ^8Kk2#Hsj31Sz30t9RBMeofan4M4zX-Ll3RF?gL{A}IMnfxH?QYbeisle1q_4aF
zIn?u4Py>90%DFG$QEr1#sf$FN^LS^TyFbu55>;!Hi;2H-`Ix)061AhJPy^SZcCr&S
zU;{?tTdw~JDn&n_A`rzdj-E?IJ(rJ3I1H0<5h?=psPD?#CB(m+#(6H3VN5?e;R8r@
znz^W*u177j9<|ehsE8dyJ@*#sxyz^se2+@SE!Pj^`>P4VQ18c}7M$kM(1W?C9T&TP
z6)MzYuo+H9PNtcPs)3!T1zki9^bhpI>!<~Ni_Nh$g`@GqQISk=W}`OX71L-z;~sZm
zBx;3IP%l1$I!?<_)%!duw3jdee?m<dL-;gc4~)h#Y=M(e8+i!Z;apU0twB=dne8+b
znnvt`uc3By74H-o>I33So@69yfNX4u{an8i{ppWIO*93ypvUmegcwJEJE}%r!w8-K
z^E5Q@HSC1VDr`R%Ri)ig0}MtDJP|d(e0O~<>I?ZCY9lYBKfZyAz$xcB%%T6j>jw{D
zfy{5hX((5nF#uChJIi(b0@Ofds2o;fJdVXgT!N~R-KZMa?>vMWw-L3lS5U|KB=RjX
ze?w0Xv>RxDWTG&Weg<l#<54-^gk7--^?~{tvoN&ME}#T8&Qw&SYMe_^3x3ME6SaT_
z*FRB7{59dbT+oi2SJ|8eqh5?c?YtYR=yFiSRgFRT5GqCUQO|8e<$Q~CFKPovFa<wH
zJ=eC{{^&(k6aQc?bmu}cmf}#HftuhA)WY6DJ@+@%4zHqW=HJ)~+YGX`(-D<|yHWS^
zo%cGYp=x6pDq^cV8k%5(yRii|!43?-MhwGOQ4^iRRJ?$Cuf<?HP-|3#!cn!5f!c8n
zCgIOe<19yQWHYLWy?Pq@upDzYzClgobB_&WAnJukROnJL1T#<*6`>~Tho^jq99Gcp
zImG^V$mOVG{R-+k@saD_#B`ni7~-v!RN*$9h;`^Qj8)@S=Z~mkHiF++JvRe&T!Ti~
z1*PDfiBYF&Io>(WBke+BQD4sCsQVi*Rjtrb_78|&sD(_&L|lUU!tHj~-$os~i>OGL
z(Ke(lQKuskyJ0Ez#D}p59z<>ADpq0fm^**(n)R5Xm7Ju}2d`r(X7IFf^>gfuzrYMU
zi1*<IBuFNo4)tf&VGUkH)kgJLTRZbm8(NMk=33M^yWIWr=xIln+ylPj>?g7fcH(*_
zmSH987;VB5Y{DW89M93iN_+@UqKY<Wg8jhsMnzyTYGE&90bauH7(J2r>%y>!_D`&h
z*pL2sEW*f1HfLk-Zu*-s2T!Al(A;lx8;X&1%TWVQ!hEblrRJ}A0evRhNL)lk?%HI}
zhC2TNJ8%_7abqdg;x_Dq-KW@^coZ|~Z^b3}CsZm1J!nr$J;u{-K<d?;cm1@f{KC?&
z!ercz+E9~6BZ0;(jKjET{GEq=krQH8V;WvUr6g#&Jw_=QO}`iuaXjk&N?e9JP&rQ|
zFTF7vIS^(xQuyX=Y>i&R3_D;JD#rsc1|LHe%T`nb&Y+4ic%}_~9EQ@*Lj5Y1I7edu
z{n^+R7hyT>!PfXM)Pir@zGo6C-9j$p;v#$)yWw?A!l+rc=t{5`{U=Zh{R1lJ-(xO@
z&bA+-{+L0(23369QP01JicsLgcKl?_)A=7tLj$csEo3*UD6gP$6hFs)=|*4#{V}M8
z&Bh?C#XYzS$&#sh#7=Y+AEW;+D(6FfZd10<xdl5hzd1r99RGp}<);{ew{Z-H%(c0D
z2#e{Tz=_!MQR_4uK>v)h!#w)|nuI&Jz7-XbBF^eQoP|n3<O1@4w{Fl#z_~aMx8P8`
ziHbz^Li-_Fg$m&zRBlgUC4P@#SVI1^f#G-;&OqwS)S=$<Uu^Gp!S?ifEhhd^G=^{?
z1!v)4+~OYm93$!b5XVf6!fjZEdhQDh#X`aufP=6jjz$&RBdGV6V=QjN68t@?#(bC1
z&`L6v*c_Fic2<MY_zeCMkD_)^ywpBF7TeIDi|M!$wSku~9xq}V>MUwO-B2~qA3NYo
zR7#%kXi%8u2(lKFy4-%b_Mswk1(hqG$8Gf|BSA5fa20-x{y1ZW4f$MDD(X=YIf7ci
z8<>R`P?2f9(&|OixQ`3nP*wdTY9}vZTl@eY#IJBPj(Ea;at~tx{m(EFlYU`8y_ML7
z{^PhF_n{V$PZ+hJp{R|HLsI9NkKBzLSjvt6ph92#qz&zO%%;B%yW<<EQ2vO4m_Qg5
z(sZ1LWf*{mu`?dW5d0Wh;Mb_<ZleD8XLJ8*J~~`jgT2tK;coyaK%!;#Vg;tJwFAsU
zP3WO7)?zx=;Q;(2a&Sz<Itm)s<4p7+96D9A@K^XIo>3_7+h9K=X&ddYUk^;>`eM{V
z_8|Y7wolpr;bAwbW^Q61oW99^^ABK8`sq*GZ~TL(g}jd1alvL=D|;}U{tM_ScW=^&
z#cLRbfh;csW3V@7pcXU}Rg|@;2)u+!)t{VSpmHBjYkxyBP~%jij^Q}hUx0dVRW0#v
zO=BMyH1JX9c}$@HwKHOiT|f`ifD=&*p5yvYp^jZW2H{D}#J^xM`aNThV;N4NKL@qY
zzdu9#%V_8?&TJ^hLAVe{<0%}8NzdBz?;)?4I;8MTr>(ZSccLPB9P{uKOv1=*c4K`}
z{jt~+S729s)uW*ueU2URCsYa|w%ZV;U@ZOq&IgcVV^(4ttabgp7)<{aY=&>)B0P<Y
zvEn)V-xr$DpZ+_jdA#>%jG}Q3m5S0|+t3ZgbowhW7aQI6&oF>~<PMvnMAUIC$4H!o
zns60TPNvmP8{y}0JpE5m&sWsnsS(f2rZJEU>rn$=K<(t8n1<hB1jg^OIqr__>5sy(
zI2*N-vsi_nU?OJiw&#BYwxhogHU37_#<pU6CG#{5O>_md(~v#37D{mp{dri9?_xKM
z-fQm<K;?2VcEuy8`<LDQHv4S97%RA5gDT2nsOLY&JOBS*#D4p?Utd%TCZcL$HqOFj
zsPp;_#-jfLyOR`DByvzyKM?iYNY|f%@$?s9IX;WS@hUdMf`jDWpGFZ44N!qvz;M*S
zlQ9|><4UYUJ)iKrT}T>Eq(2ZR<8QDG!+&FQ{WHv`e;n_@AFv+|IAl|{?hx_s%!M6X
z=!7RxMRXZ+@D?Ux)(bXdqwqockE3?_CF*_O7u}B#D%X`*gp*L?)VurdVJiLqqTWwA
zO#T(p!o#+j@537UOK>Xw3&U`9gZ;gpftqkD-jA>2hnUo8kFVcLcAOYzUrgfu{isN+
z!WcY>m3Y;o(Sb(x%eFWMVlMqf&KFS&{0Ax$Esoe!rDHq#y|6Fdi+Q*SGw>8@;-7FZ
zCLFajH3x&}KaNV3w}FNqjrUP6Ttp4n{FtqQG7O<V4z-Y3sFklr9kUNn3u*R>eLfPE
z%4}5Rs!=sG0YlNl-naoxVoJlHxF3=mrk5XR6`XxnX4YMqd2v~}`I$Klo$oF6@#)zx
Obx7HehTuIz!~X}PXF`|&

delta 8502
zcmYM&30PNE8prX&k^-`cC~n|iR8Ry21r#keTp2~w)Lb(Wmvq$J$gL}A=2BYb(wG}6
zYFfD<kyz0rHO-_6>7*%6PEAuTIc4corp))}xz95_J$}x)%URy{Jr}g{w)a2pcsu_H
z^WA9p&&S)CrkE0{-v9p_;4vnd?m&!32ld?R7>0j!`_;(*=2!mk!^X{x8HO!zI4;0+
zti(<j5N*su3}-TEbmKyQtc|PC2VcSn+=#LG1_t2YF%Yj{IDYTm_ikaY$GLVyCNRBF
z?`66U!(jU3F@*WeOd391a8NHSLruI2wZlRT!DFa_Do_zPgUoGiU=W71w9iLk6Z%Qm
z9tWU5I_~{dsD*FEw#;vi&>$-2GHSpYRH&m{8Pf;{VJ)1B%FZlQr1J5>LeZCgA=bma
zZodo_sdCi9PoW}t9@}CKI!QFz#@GqRU}yTPFbym4A-szT=*8P@upQRNk*EdC#K!oX
z+uwy+co|0GIrsi8_kK`o`+Td`#9z7S&V^by$h|Qf>(YM;6`5tI0gF%*mg5t69`#;2
zt0D`gJ8GvBQ45-hO5ti$@ohtmcODhVU)vCWO%xDkOb={|3jH|L&ex!F`x2($4%Cb1
zP^aP>REQ&pr*hg7^?W+k!M@0*%}`Wo7olorJL<g?4h==%W7I;<V;#JTD!SX)0Uu&j
z%5ge2!>$;G<4^-HK}BLG>ivDL#i()0QRAOMMdqKV@togj=mjql9Ed?!8yllPMx!6b
zqe7pGykZ8r*B7D&T!wmnJL<Xpn1S!3Ht3sZOarWk+CUt#0mo$0P)??zR<s5i;)|$b
z^cn`?hp3`Ei^}O$)PjFU?aaTOt&t|E6s4jf)CaY|Tnxsg7=Y{0U*~@d4ZW}jmGcr*
zu1{cB`~j8Qc1iX;_d+co4>j>>)WBO&3p$9J;BEK*NmOe7j;e)fR7!o5i3IbTPBdch
zF;@q5Z1%cVpmy>V4ni-!DvHEl9Eg)q3n)QNP=N~d4J7);huL~#GPc4zREoBtqZOCX
zsEZ#U1#Qlua$bW<i67z6j)G7FHpEcugQ}eos1)U(CVmQ4<ttGODngBa8pH8RRBC@t
zA^t;Ygr?dDC!!{L9u>09s0p^C7IMJ7e+X4<WvGEFP!n8n@85F!_fR_x;cFI#v8W$D
zol!+TCyn@P!bMyN!4;?hH@P0gdh|a<?dU7ib2X?U4e4n6tx^3>NYu?>)c0gL>cjLA
zDq`1A&)vlc40l)#X*KcK9mk<UzXP?S{iv0fp>}*473%Zu^>0u``wJ>U_puH7@VV1Q
z5>VsxM{RU8K7y053p#sfXlGZjA>Knx)S$D?r3dTN?}&_T2BL~>1#04r$N@30q9*tR
zmAcPS$NDmAr!}Zri(pp0-x3??{CA+CY9ENo$u!gebFeKgMD1)ZYGDUa&y}DzzKdGG
z`=}8AfN|*cu>FN39(&Rsh^)c9h&oN5ps&vVH5yvce^3M7$Cl_toRqs5)Bu^7h%ev}
zd<QuoCWMbff6Tz)x{pfXztDr<qs9;JW@{r7RU6ru#QbJG4IQhK7==H&{m||<hh4D`
z*GHjtP>9rzsYXR6oY6F4BUEifqlz@iwYz&i8?~{KsG@!b9ffo~4Xtpid*dLgXv$F`
zt#bQcp`QO4HNbsT&cg_gavO<CT^#D1C%g7>?~it!f~vK7J&C_^xz@e03ALl$sDbyR
zc2bNQ@FX_I3vT}>REqpEYy{#_&!wWC%fuMW#aMhE6@g=@@5&b$#J?YnZ@ADG6MNYS
z=Ofi=R-kse6SdG|sGYupir8OK&s{)0cMBDPT6}MniXc?K32MS<)cc93lyz}v=)qp7
z9S?E)V^N`=hCVnCIhkewss@Tt3%ZFK=nnc~4QfHYeeCg!LXF=N70LFlJy9EQhR~=*
z;|ce|6x0gyP%kb=9jEoEFWbAQ(EfnYSckA_!bH@7{V)<oU@e@7+Q?#TfGbe7wGBy?
zV-C?!XezKJR-$%v8y^%I>H`u+o@5-hz@DgqCSh%S+U+kzKl<xY6TXUC*iqE;e?||U
z#c-YfpK0g|=ilE>&<vZ<@96f2qN;ToYJlaafj6Ow?G5+(2dHt*p*D04{qPPd5;d;1
zGVOOG2x~FF=|ST`=<p%>BQOBRqINdL?ax9Dv<Q{U0&I@!u@xRe)yhRwE&RjvYt*>k
zp%!)%b*z6whmVt~^9TDtChCVxHYQ;XcEAm&+<%O5co+4diWy*kc=bjtAP+UsHdLf`
zyOy99{1?~rs0DmGfcWdiFI>=sego}}(@_!Wfx4fK+WB}?@l8e*Spf#(PE?BCKt1;n
z>iyHM)u;_z$JQ8?WuNPtMf{s`A&Uz^I1OWQ0X~X_s0r?%QsFbmK34~|!$zp0Y>WPw
zfvTN>s1!_f@6T{u;kq4F8*e!@6tZ&E1RuILPNOFH90Tw>RBC=gO;jt}{+tg*z1JBv
zPES;X`k`te2esqL7=tgO#wkT@*!dd`Rq+MX2j+YCM(kiaQ7Q&=y&LL<EL4ccU?}FG
zCYp<y=xO}Ki^w4bZ~i#c{#~*Zb-Zt)z8CcfFMY=(&`9LM5Y$5QaXW6pS21-MlVO!>
zB0pnw%+{cuD@297`v|+BG5BC&)afe42gms_yO5!%FX(D?^u&iW+Hj%wNc)S#Ow>Yl
zpsM;9>PvUgy?zgM?7~LbNTi@b+68qwvM?SOU^?!_PIv{ikw&Ab51fywT44nZh3+@(
zhAnuiH|C%Qehu}-dk5R$6&#D9{6Ub+45U8INt}sc<LrhCP_^?qYD1-{Vm^f$=L>Z7
zfdAumN8zXk($Iq$*aRnHUtEgq@ng)uyVxDOjc2#G6sO~FsBtGhVgCj-8x?^gs7PPK
zhcSEt@$X1u@C18d751e65%xm=96Lc4cBa1$Q}J)850jZ_bDn}}bbDiCT#OobGwQuF
zsMG}H@>>(8qBa^f$+4kpHpzy125R7ZY>FlL3Vw#&aN1;B69+Mgeibf7?<qDF%TTA~
z0yf8Qk-9bhQ*Hlo<Y1V5jK#AK4ejVIMq~1mHuR5TCjEKHi81eETMVD(Ry#JLKL#Ul
zKB`zZxcAGjfd1#GosJ|gU2zg}AWRWb_r|$LLn|KsM>}9HD#s2+;ZanvRG}i^HN!@#
z2kQJkighs;8(^O6S`46HgmHKn`{5-F#+Fnn3+DHK8oDqNAHgZO824g4wwPtVT-lgG
zKM%X$3DiRWi^_T2Q}(azy|Fd@h1d>vql)h=>iNLgHiF$SUgv)_4HeHy)IjB^g<M2c
zX~Q`-MZ?gC{u<N=XdT925eDKZ+=pKv*)sWa?L;^58Tx+nY|fuUrR<Poesh|Jj@fn8
zIjue4hO#M!((izL8cZ)#?slS1$uG!3F<tVk+cA^A*VEPks1ML)+=W%Bh|J}zzJ`0y
zQPE^Av^$)O(ew}C<9He$#e_vR5(U_TemOS5uTi<J!2uXY-oh{s8{le8z(S<V%o)^s
z4==IzA6r8FBe*b=3r+DkRPOd*HlB7Lj3R!G>8D~6X5)6uM?L2ujCJuT48Ucm)3Fv+
zTl-P(mtr&g3{^|F92zRJw59gvcn<1ZE<){WH%8*8xC(Eeb}&ERKEEDA=pVpDEJJPJ
zDmKTk0()#zPzxH58h;@+#9a;z<>UlXpyoQVCNp-K{c>GKMW*3$d%jb#3;oeZaLi_0
zgY}=azfcsSLVf_1iVLWSTt_Y74klyh3L6=xr`s5eW4SRNWAHuHPQJl<82lVZ6Qgky
zuE8|?H$IG!EA0YDVMqE)u_eBZFXCm?0%j0KEoddOQOCSYL%FNB+TLh|z3C^RLO&lB
z+6~wqPogHcgRz*%_UqtqR7fY_leh>2@ZYGS{Sia4{`2<7b__nLB_z;j&5c)ZHvSnE
z;*=No-s3DJYNi_d<Ak+#fY(tI7Na+w!bCiSnRp*LK&JmX#=r`kfvJQ;r)m#wR<3`g
zaT;HG$$m&4UvGc<O~*D|KZ07wCFFn8_htJJ5EoH3ld!>lns*@OW4^?6oUqY;<F}#~
zavK$yS(|LFTtX+D3;&|g3V+3B*le>co^BXQe+YKP9Mpn#p^EYpDgswgsq%is>Otkc
zD@I`sYMcVpF?`wWzxfLB*Nf#`2*%5(fp56_|H*!kVqE*97BC$(;3m|9_qqMQppM-I
z48-3s32Se$U(8O}mi{7~jQh3_f2}m+Rr?!G3bv=e7zg1Y9ECOb7>?R%&wnv0b!U(R
zU<Pfo)qNfn$saKdBlt?`G-aVSHqY&^$8`F~9U5^oenRaiYKI-D9fr~GkBZP3Y=#S6
zx1df<8HV5~w_lAx^lzdM{*H^$?6lvDC0Lv8UGzi8r_fFmh$Fes43&xnsL-v%L_Cfu
z_?>$_a+f_`Ss2ark*MRi7#rgrT!Q6DS(!(6+X$b-@${SSdGNerme7deLJ|G}D^TY)
zw8-wH2`Xo8us#mM<~R)_@C6))MW~4R?zO*OM_?=Zx!3~N;21oF4KQ$@=5e@5Lpw}F
z4LBAx;XKri3sE)kIgUpE{q{GRT#TpxChGnrR8E6mvnlO|x<3bXf2Z3&i~Z@F14Nkl
zO(qT1z#`Pdd(nfRp;GY^sy4h2+7C%R)UjQT&G1hcfX7iAs6bVJHR`#mZvQ?ia&=y}
z8%RKBI2Y#A@WIpQhgBGe7f}oN7B%o4R51p>!N22RJnH#k)I#3D30RG}*zHZ5^CBEi
z|9k9=S%>Uz!K)4t|6W|U#0BNfbJ*sp12&;Q0#!_Numi5eSo{Fv@ET6R`bX?epF!pN
zWmN7<QMta1-SKDCIH^bN{i#QZe;Y2W<AOqU9JP~AF&b~;OsreX-{mnM!|*z`!~3WS
z6OTRkyNDTrm+6;cBivYG$2sKs8OCt^HYyTLowscDkH7(3n2!zdBqm`sreIL1wI^zU
zd8kNi#y~8`26zg4;MbUjt=_f^9fO+qdCbOQ3`NKHxE-KA_T@q}`r?zQ7iOXc+=LN$
z0rlb!sD*fy*@ZVpg?t8TAsbN7A4H|{Br0-WqH5?C*40n$&=dBDOZ182&YpX*QJ%c1
z)2DkT<a#FNPS2g2JJB;~=4{UsT$(p0clMm(<bFr|gOU@H+b6Vd?@3PYoRn7lpTWJo
zygC)94(&U1^p?tZE8nhsi$4!nt@BitSH4$yqOz>=u&44!)w0TCl_gaLG%HIgODm6Z
nk3XxH@@N4syytoF#9>}2(fb}AKcPX6R^{{Fv&9Sd4iEny!>Xq!

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 2eb52568..d3d9df30 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
@@ -17,7 +17,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -27,7 +27,7 @@ msgstr "не установлено"
 msgid "installed"
 msgstr "установлено"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -47,9 +47,9 @@ msgstr "Успешно переподключено"
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Неизвестно"
@@ -162,7 +162,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
@@ -284,7 +284,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Database Configuration"
 msgstr "Дополнительный Настройки"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -359,7 +359,7 @@ msgstr "Изменить пользователя %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
@@ -394,7 +394,7 @@ msgstr "Настройки E-mail сервера обновлены"
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
@@ -494,108 +494,112 @@ msgstr "не настроено"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Файл %(filename)s не удалось сохранить во временную папку"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
@@ -608,175 +612,175 @@ msgstr "Настройка Google Drive не завершена, попробу
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s форма не найден для книги с id: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s не найден на Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s не найден: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Отправить на Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Это электронное письмо было отправлено через Caliber-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Тестовый e-mail для Calibre-Web"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Тестовый e-mail"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Начать работу с Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Регистрационный e-mail для пользователя: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Преобразовать %(orig)s в %(format)s и отправить в Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Отправить %(format)s в Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Отправить на Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Запрашиваемый файл не может быть прочитан. Возможно у вас нет разрешения?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Переименовывание заголовка с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Не удалось переименовать файл по пути '%(src)s' to '%(dest)s' из-за ошибки: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Файл %(file)s не найден на Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Путь книги %(path)s не найден на Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Не удалось создать путь для обложки."
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Только файлы в формате jpg / jpeg поддерживаются как файл обложки"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Ожидание"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Неудачно"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Начало"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Завершено"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Пожалуйста, подключитесь к Calibre-Web не с локального хоста, чтобы получить действительный api_endpoint для устройства Kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Настройка Kobo"
 
@@ -785,7 +789,7 @@ msgstr "Настройка Kobo"
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
@@ -851,7 +855,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Логин"
 
@@ -1070,41 +1074,46 @@ msgstr "Изменить полку"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана полка %(title)s"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Колка %(title)s изменена"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "Публичная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "Приватная полка с названием '%(title)s' уже существует."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Метаданные обновлены"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Полка: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
@@ -1185,14 +1194,14 @@ msgstr "Категория: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Поиск"
 
@@ -1212,102 +1221,102 @@ msgstr "Список форматов файлов"
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
@@ -1384,7 +1393,7 @@ msgid "Upload"
 msgstr "Загрузить"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Скачать"
@@ -1551,39 +1560,38 @@ msgstr "Подробности"
 msgid "Current version"
 msgstr "Текущая версия"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Отмена"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу"
 
@@ -1596,39 +1604,39 @@ msgid "In Library"
 msgstr "В библиотеке"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "уменьшить"
 
@@ -2473,12 +2481,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2967,30 +2975,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Удалить эту книжную полку"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Книжная полка будет безвозвратно удалена для всех"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Сделать книжную полку доступной для всех ?"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 22c37233b6be8237799631f454937faed6473bc0..2843a58004d4c57a2a148dc3878408a253e5876e 100644
GIT binary patch
delta 11078
zcmYM&37F5-{=o6CF*DW~%Z!m_7>sQgV;`ns$euMxh?G((MY+n7A1*B-BHaqfTGB#7
zS#ArZL>{-aQ-8NoNx3Oh>fZO;`99CTr{})T`ToxLoX`23&-rpYdoF45xunFA%E^l(
z{&^-TifZC5RqXx$KRfcGs0H1fSPy@~rkK$rj4#H@^oPg&ahOAY9+t-EaS(3BD=>|h
z+v9cEE{YP-6EsqI@DX;z!&nNl^P{LF*2k*Y7#m_IEQ>c`I!?gy_;<|21?adn@$>!Y
zxKHE$cj$Vju`KIH=gv1+v{@Kf87nZL4jMoU^o2HPAQz%L9*B+`jRrIk&EO2Ii%(!0
zzK)JRfF}1S*1)q^p7o>5f+(tvb<lwqVN2|XWpHNvd@h>O<(Q67qdVS;7vVk}h-I2b
z(WN*XN8mc_jiot9P9YkEb#MkIjC2)^EPM;eesma(v@B6n!yHV-A}oiUup;(Bk7@*(
znbBw_reQMPj~V!2++T?v)l-;*FSR89E^vqkzW5V*cE6*M)@>C<1RwQ91502LK8tPf
z7<x3dT8H;@k<*L{urUrtH*zly#${-rzoHpWYeW8h(5Ow=X)$KgABqmR3;lgj++UBT
z{w?$j4`F@$51OH>MCE(6&=j}FMmP*}aTZp>b@A`p6Ew`gVRWH0cnwx44E^!w#P_4u
zZvmRAm(Yb?#me|8daX`i1#HOOGJrz#sD@xBjzPyK&_EIkX>_8o8cp#xXi77f&FZa&
zWGiZjPIMJg9?@9zESIAbKa1z99j%cAcnN-n9%=2Oa4Wi_w`2?wNFutIhSmExI^joX
zioZf5JcUk}a$(q6CG<N{2VL+Qqzt0lFauYi#kUn};|{EjpJOdNgBE=ji>7-2+tYA?
z;@IA33a>;1xDh?W$=DNDp%b1!-z$A_STGaqS3@^aAH5wd(Q90UW~vK%jfY@W){m~G
zVd^KNRr?g0vV-Wr-_V^Ub%>%1FblJ=06mg!SQ7`MflWXcoR3xUF*Kta(Ia^+?kAJR
zgcD`ZsEv783wxn~+=Ld<A~dC&(FL}lnK^_8bPTIuR2%}Tjy32uL64|AR>48BH=_a0
zC?@|_;{!afs-Hkpw+>xk3p(-JXa<g=J3fsDT8hdwpa$p;JE8ORN8cZY1~3+VZwh(@
zbI|}-bV`J?-Wd<rj|OlAjqo^nroYC&m*^Z8s*Fxp2fZyV(Nwp?*4Q7->}(|4(Nc8b
z&#)z)L^ob9!GRcQTXY9K(Bd16266*t;{<eP3(*}dL*HAEejj$CHM1M@@dxx)RPPdw
zwl6lIe{1Ywbl${{xbZ2P(zEDURqe|69rMw^rl1SVL3j2dy3jkwztI`~r#@cXEo5R8
zx`8QZp!Z=OK8_ako0#nVe~*Scdmo+f2%6gR-NT0_8;j`oL%y=n9P~(D!!+E72J|U<
z3;u%*F}+84-WHv&4;sh_^eDz*4e$SK8UuN-0)6pUbi(YOp-5VzMb<y|X5<?Z-Gc`H
z2BzYEG_Vhlokd^9zkiKo=$}N3?sxQvvw9I2>qiY}_+lYiESI2>&P2vW4`W$85<mYA
zJ)%F*qp5UhILjO~<sHysyfp5Q!d&{}(4t$6eC4C3F;R-f|Isj&-=PbgK_g7+9U`tA
z+YG&iy^tZ%2po*hpn)d!2}jTyeg7u(`!Ff)FO2&u(Oa;+5BcY2ML+VuB5K|@L_QJg
z(0>qH;07$lqgW5?^$Ta(9bMo`bjRb-@%LjfZpYGi4$Wvv|B!*IScZOHfAXJ3qjmg4
zXH20#2tC7L*ceBmXEz6(Xf2wlm(jD|g?y!>y=ZNe9uP9o1r6{Tbiv7JZOuZDa7luO
zXR#5}@q09Y->?Axi!M}fSy-qD%}ghB$D^<kPQmgx51r?6be?r+wZDLVNq3|7{s?;X
ziE}jEK{8jM36?{5UWi6~5jwCNCShMRumM;RXQ0<^A-ba%Fc06v=6Diwu+HUC#78gc
zj9%y2$oD1@y+*?Yzd(2N6}p3S=z`@2h3ZX5`>oI#Xp2rb6r15PH1+$CJw>Ij2w%Wq
z*pvQz<lpEM{wD*QQ@Itr|6OQUB!e&qN5m%3R6mIZ^ai%XgV+g^uM9ivhWYgGM8BYG
z;{I;5W`0J#X;J!+u=7D!NPht)d;j02VF3HlV*C&*;8(G~#J?vG4Vg$ochC|&^KR%-
z4MYPS9{+v|S{u{RqgojESE1uKW5S7ErD2i1k1l)!o%lzzHvYg&Od1xfivHd-wmn`z
zzZ+UBSI5t9K#z6;I{zdrhqKV}3x<(@7hJ~!7kCA$<9l)cJM^soLNiqNsxYnzI<6QS
z;4o~6GcgyRK^HoJZs0RC6GyQJ{({}{;^E}q0A>#l*JCl7kr&XN>_P*37v1rfXo^o@
zH9Uuo&l(XH%0v4t(4*`cKOcw&G!&g@G`gWX5;Pn*6;08cxW5=Zqg7ZEpTqXJ5sUCR
z8eoH~!$i&S{Ix{`y9mAiSD^D>g>H0A>|}H!i8(Y((PQz0C(#IBKwsPu|GpQ!*9XyC
za1K3!f|22`)4kAu$D#q;i7xOEX5*9SI{!q+y@{-ohz`)m;=$+W8J$8?o^nn6HyAW^
zebKWWil#1sHSxaq`5H9!d$B4Wi9L<Zn|^J`SPt56gr&XzMKny!C1@Z6u?mhscQ74&
zVLs;I3N*ks&;>t2#~()*E-@<H`)X*v4O;De(0N9q>)eHztRKy%VJcV0171ZZJc#c6
z7`o$AXbR6^V=Q@HFdqx(501ST8`0m2b@5B|=t^E6#y7(p`d4DYfs<%B@k(rk>*D@l
zGy`8@3Z6oX^f$Ell1GPrdG!6NXeMi69c+g6u|K-=iC7ZvLu+g9X!4&-<8dD7a&)29
z=+2+PUbqGQf|a--{0*rxI&J_~#=+<xHe=8YEJ0Iz0KGNephcT=W5~ontVMs?jpV-t
zjb%JA(gWzkzoI++1C2cOrr-tW4)bD*(7<}d{b6VzH)APWie_+i{QD+MrN0Y3^1TTf
zUXQP_29_KXu3v4mXquugbj2L(jZQcgYva_ozZBi!dTfM8(DzE+9BxTEn(`*t5ZmMB
zn7D?9_k9Z*@h&uV@1idpMKf>`t>&a#!u_p|2AmsPj2_`t=(uZQC&fO52EGnU<I6~<
z6VdB5%)lNrfUn~LC(sE`qXGPZWif4RIP(jz4E-k97~7zMUyaT)5k1OjXsTzS#kU;I
z&?;=;{ohB!B07a>n0jlt-<fFfG)A9~LKhs51~vuLaXR|@d^F|D(3)6{j@ul&4GrK`
zG=N=L+WY?l4Kwg-Y{qSzV+jfq3weHcT&UVA<3q6)V-C-6M;BUzehF7&J$xNa@z=<y
zML#0t6%D;T+>YJYmi}2xB+)3iBm5PqC7QCSXsTyoF3!U?_##%qZ_(oXJvL)PD8{Df
zxZddRGcgmFpzm$KbbJH-{on-hpF!jM_=msHqe%N(NL>zkmi5sW^3i+S4Snx=Gy{{c
zA<jX+crRiVJcKTM94*Q}(G69Z7~U(INdA3rDG!`*9OmOJ^ekUQ@B1t0*}sDZ_&yrY
zH`p2fi$k#UoqX+ZDUQMu*arvP73N)zt?BQ_7MPTn6sop0w&cO3SPiG43p|SDa3dPv
zPIPAn<LAfF9iPHX%$gj|z6n|rt<fVLfX*`*tKlegp2XcWES5!RRW3y{@Fo`EDQtuF
zri7vyg01K;K#yiO`u;v_iigm7lBR~EYJykM?}h%E@D$d>caWk_MBmWxOq1^pKh#5S
zLvh?65%;H{XZ={*e+KK*e;W<pN3^)kpc_b?7E;_At&P!W1|LL^d?jAs{og~w;`kEB
z;aSYXoA}Kdco>~<33@BuL3i>2S_`MKBbJ#S0_=$fHWagPIvUtN&{|rHuD1pI@ow}U
z4JW8IBP=)q)97E17Repx1Z%JeUqUnS6MBZx%uwZ7=<`O{4cntfHy!;#Zb38gCHh|J
zzmxy-3)67H5$Hm<pv5!=-SGl6@+Ej7u8;f2u#o;4bbP_Auz@aEm;R+_25v<&IvWjS
z16n(u&LaOVe3S<k#YuFbwAmp=+2{`1;4r)y>){@B+;Q~m|3Ird`JV8HSw-}Dc5DNz
zMZX~K_r)CggYO~#^=aJ21FQE5EWmd$75_ksCh6V~U=~)V-wI82-}w2}ScCplG>}KJ
zA+AO@xDPwwr|7&j?+feJOT>+y*nl5y!)EvhnzA>sG@is9{0+Uo)$b1zw8q->hoaw$
z$!LI!&@bQfXtBM9zV|V@p`S4u6RC5;gIx55c4%?*LMI%F9?c}Q+8@C@T!$|F0ebeo
zU`Z_VKzJ_=%}@jMs0z{fyT`u|!E)aJ+i94hY2iUM7t7Fp6wBgDG~(yb0A5EY`~Y3>
zD|9E{VsA{H8+JMnd(a<?zPAP2;X7zxN%Jgr&OhUPgNlu95nGI=vLAW`W3U|FfliRX
z^0)w-<1+L%yoVhy^}$e6UC~=}d+hV*QGc(jA61$kilrTTT}I*vyb~+nhnSDwphuFq
zAQWjnT2#Z)Vq1<L-5xZ9hvWV+Y)1c2Ova`Ug+CKoV8R^~((syf!Adw8+v8m9j&H^N
z^o3#PJ<#`tphq(r&D3Nxki}?C?8J)ruekqjv>4B##aM9>`M-`v-lFj0eDuYw=!E;Q
z4j#iCEc0;q&un?<k=%$WI6m&*iPpq)^r&Xx`6EJ$co~|}ZCDxi`fX36ahM1F@HiUT
zg^T%%Bo0D<-;5c!3*FI2vEQQi{x@`?DvyM~>!QVbF`D`w=sb6#wJ{q@;qC+tC*Fsq
z{!28%pV5eu{t<Rw8;!Ua2jV~+j!&V1r#u?Q4?^F+9sT0X#B^MNS-1fWXb)b5iPJRt
z(rEQq__WSM2du^RcnEu9g~!7Y4M7)}fz|LKtd8rkIlhI(cn1B_wObO-yd#>q!RYfF
zG1L2h8;u$~n1!C@ljwl8Xdus__xp3Kg1@7wuDCRe%f^oMbJ5gZhc$5(R>jxQ+wd_O
z@KJQ0bJ)@QUwK(5y35d_x&gc3I84XQ@$=niG44lq@)LSw(G$VS=n>_j#aD<fcnQ|P
z;poDX&<)PVa;zUcLc^V|jDI-j5A;7qi{vY`s(-*jJc*uVqvatp9nm8gj(!jB!rr(I
z8(^s?!x1;b&h+obTzm}^ru=IfMtB@Klc>}R3J+_d18c|qF4%~EceEzPVH4bj?eH5M
zinUjUT9}MO=&#3HF=bUak_l*L=dL3Ep3M>-SUhXc56Fjc|1UJ91*^lSv@`ahe;XFy
zPV~JKSPN^d2~~YD`rc&B$9ZVL+wl@iSsT8DJ=Z2eG4<tvXE_YLj$_d?o`KfHLadKV
z;@@9Ki|`P7&yS+-pFoT5zvvNFeJVU}7F&#^cz#*jADW0C+!8;SfELL;n1V~ufL6wC
zK^NMK2KYI;;0bhm%G05C%Ax(LXsWZ(K%1iD3(<KK{b*c3V-#8gQ{(=lXzDhiFMfem
z^Y>UAlh=i_&qc@e#|AhJ({K%z!cFKx+i@@+z=7ECne%}qqA4`2-Z_|qYtRh5g)aCx
zx`Webai**f0auT0g=Kl(8y!Cw9XB3R@g6jQd1&TVU}@Zh=l}fQLBlWFyXPP9AB(XJ
z{qM0P{(@HbS!|Cjo((&@8J*}3G}TklOw5e?8_*-#61xYjiI3y{Pk8>n|3}Y-fhp+1
zS(t`7=)}#?DsPRQ@OtzJp2DWM2My#G%*H>_>aX#9$Uw8$Ht4vE(2RA(glFHMhN-y;
zP1O|afb-FT@1YBQg6Ww0Lil@p6>LbqBc|aE=zM=ei|j#k-nHmayo}EOD!S44U*P`x
z;$a^6!g2KMOKu1+Rzqu}30hp;&>fCN$3KAXbQM;_E$I7u&_EBz{U6YIk~W5Uv(fhp
zHgf-cp*s&On&D_bw_|ynjxI0{J&GqW7uTWzy^HzyGZtXZi{bzI^v6c@@4)7`G=9E6
z_9W)<JR`9wq^1Kpuxs3(hz4?Z+<yQ)yM^erT7sr<Rs8#N=#F1Pzl6Kcz>Z=CtoTwW
z<{WgRx#*E3+S72tVsyeDSPn14kvIY~@m1`IA7C<OZjO%#ThniXEpQ}yL<_McZit`%
z8y#0=OZa<6FRa7*(XBKrq6KJ*Uq*NGPppLdu`+&v8Td0+!PKoG)iu#fb;P#V2i@7M
z`1u291|CB<whld-&6w+-|3_$;vXU={fpyV-OEe<`urUscf1i!kz+&`^xeeXfhv=D>
zdnLTr7VFY4#)>!!Tj2y8flp%^>qn)wg=<y?bLi)wJMV;9I1sDj7<8wz(G)Mjnz#|q
zUsKGX{|S=X=y!Bn&F$gKScKNl<!FY7W1>EdTWDAV3*!Ngqi4JdP5sm83)|!V-nf4l
zJ@X&XfNSjt^E5|~vK<;o2Ta0|=&c!reoyA?ApfRjD-S%=w_}fB2l~ID6SvwK&aNvO
z*Z}nT73ljnqGvt{GjTe)p~dJYd|B)YG=Mee_1?FW?Pb&Wga>*C7yXr&z3IEWqQXtx
ruU(Xu)-u0&i~Qzob6T`6YTjzovD@mGDA9gX+W3EU*p$9uO#1%-U@G5o

delta 11167
zcmYM&37pT>{>SkzV>Yvx8G~8O%x@O6F=oMx8QY9RBRe74hQ>CGVy>m=tB6}uWJ_e<
zD#9>`>WWnEEnOr+$-mp8rka*ZNVu=Ja~_ZXee}4`bI$MkJ?C>i=X1W)^1td{|EsS1
zWmvuC4*%O;*KwL+MI-h8|9{8R9VeUa$C!wBumvVIH_!LMF#3~he-3)+uR%XNgb&~`
z9EdTzoR1aQ)^S{CCk<}~E@LPB8GSJ$!*RT@4K~4iOu@cbA7^4P&ci@lis85(_1r!?
zei8LtjqTq+t>@EH^SHcxx4|N)2NSRXW}^ZqLcMS=Dv<k8J06XCZW=0}`KSyo#su7n
zL3j%F{3TR!f5&L_%VcfVcamsCVK(Z)9+-n8&>xrB@zto5?!sU^fZFjfY>!`He~io`
zNSuVj@gVlV2+omHa7r;A7o)34t7$aGvq<)xpHY!U5k(|sp$~S)0PKq)I1F`E<*3X|
zLuFzi*29(95ZBuN9@J62fgXG>hx}`SZyC^wcTi_nzm<tJ2MOL8jtXoM7U0{Mi`P&`
z)3UXBzcq5aPA5#mNvMsiz(KeJ6{vR`lku1~<X;1A8Bid7Fa{^s2mX%weUt6Kg-ZQd
z)ERz@&9Dy9C_^czqil&vaWST187AQ}48?=?_m5l}TKH$wLcV#9Q-X1*{*$PQSE8=p
zdQ_&~LoIXy!>|VP@fJ3~JnohP=!QC~@fePep`Kra3dG$=qlm^{REqyVr8JS*RK00P
z)|@=lL=%znaAu><au;gixAAVZqiW<5-h)4)jx>{VQ>_g`-IB+UKwM`94OQ<p)P$E&
zDZYY=(5s!9un}r!@u=@aHfq5~kuq>xY>3sU;yZ?McpRhfCyYg37E>U}=%f2zOhXa(
zu?|HoG!7NO4AdDui^W)tn(!9ty@(EG!6Z~a4YiRrsN2yQb&b2DGBp5ojmKjX)_11R
zQ0kvWRqY$7lzoMI(7&VESr|spPsYaB33Vg`u_=y41vU@0;5uxAuc0z}1a%}QZ9kke
zx|%4FMjRGkEDk{hG80uqn@}lzAGN@TsLXte3g{X}Vo0G0C>^8ew?iG#AZ&!C*2hr+
zE-obhs>YWYP*v|lrS2eVfe%m<pF^GP@2DO7P_YWM2`Zpm)DHWi<{624zYG<?Y}9*|
zs3Ta73UGIkYtH&(`@lt10JW$HZ=%lByR(@f6tz%-?PsHIOJ`K7??c^|k*LfrN3!j_
zj#~If%t4)lHr~pmp-8);CLW9`zOkr4reh4wL+xxMYDYUz@4bckK75R-nNKkT|3cl0
z^e*OThhsARC#+jg^SZ}vqXv~yzkAJDrC?9`9Z-Q)q83<%+S$9Ph0Y`YIKExYm#`-)
z6H`$es6++&5~kxeR8gP7daUn!NkcpP8Z}`p>a3b}Gas4^ETBIE`Pw?GP)BkSgYXMf
zKsBgaQ0G1qXe?^HD{8)Bs6fh5M==MZb^n*s=+D4zOhNBr^I`_7NV=ekY^3#ZY)Ah^
zRN$YW4_-tC_6@Q#=U4mtRrIItbT{+WM;&o8hOoYqOG7VqLlsMZRHRFgcb&~xA8YOS
z4b*iCxZfO2JnAg7P$}<)I)aC6e<~)?pMxs8Ey!2iIe@M&jo)Y}l{Zie`SvgohM_W$
zVC{&yhC`4?opKz6Z=wPX>uHW)C~Ai@QQwDWY=5Ke??K&yk9v}SZkThM0ToeUFBAEE
zjHkaAv+*z%;_sM<t$Ld?9fVq79BRi;qMl!gh4>NrVPGGV(MG5Yq@a$Zpbz;EqS3|v
z&=0-om!i(F4AbxtR3=uTj%Gh9Q~yMr{b}TD?OZ_BMnqqei2<kpA4M(rEUGA%p^k97
zOG9UI1cUKUQ~>_{_#+b=pcd+cTBtiJGkx*yHN#N)l^BR?Q1fg<&2tb{?eCzzq@SW{
zr51JcZXl(viNmouMx%D#4Ha<@)Pn=DE)GWpR)Qh87<KJ7qIUESrsEmRLT7;ayIwZ(
z@pJm2uJdx_d*eDMX=uS;P&>MU+Ckt0X2EDw^~T!%J*XP!ikff&w!|H%)PI3&&WRXk
zzJO&|On)8nkMjfn*ANS-+z{RW0W?%3rRc$O>mpRDt55-bf;spV7Gd~cv%`UyL4N`2
z3%bwtKSk9{-3JL4V^KRV#XMY(^>qKw(NF*vQN{QjHoz;^dPB_b;iyc+pmxw1b>;(6
zM>QH1=p_65EL3g0fI6y;wqK2U{(W>c(FqzVvaeAK*P<rAjjD}+hfEQLSyNEIx3?B!
z1pR@iTA6Ier=yN`9%}w)FaVdKo?rhE`PYI683@OJVHAF8`!`T$9X!-zAP4naJJfT1
zFd54*1(%>Q^d@SdOQ;R}h|0w8$XDK}H;e+up2Nt$0$9#KByK@v<Q>#bPNNq59JS+L
zQ7OKKdOmQtc|IAnP=W0ip^owaJ3bl}&;-;x(@;k~*QKEcpF^c+mF;gqol!M<;Xg1R
zk6;1bL<N{T!c5c=mFjM&z<QwW{}|N#6Hyy|%=#>9Bkn31iu^S@P=$){9n_1*?e7;*
z_xdZ;EeITGj-V4J&>w;dcs4441*io!U<_8F*7-N;xiiQ*u5*b-V+MXgosn0GNqHk|
zML!*ty5Xp^oq$T+B5aB;+3|g-qq~4ju-57`%G6LSYW~is%ni8PcO7Ra4NX{%O3`#w
zKnt)Du0`!+FKU9L=)p6n+V}&taKLEud>kr(HW-aPZGSwf>Yqf-vkDutzVkW_O>`7h
z)#vO3|3wAh{jkYEG%C;(R4TJD4fCuem`T6V`WB|r{}B@~ywn_F9_qbO=z3^8M?(+p
zKuvrWmHLaeA3DZlAOgJ^PeB!H1}c?pZNCtG=--dZWIv3@QP>RUp?1Cvz3}ZZoWF|f
zFa!1Q-`3Nph0dYQ{!8qRHK;FHo3Z9^N?lRUJ&j>liTXolEouWNP)F%C&fK0TRPhc#
z74w2|<Uf|i9tN`U6e?1$@n+&Q)J`)|kr!BdpmsRiT8;|r3EN+U3S=Gn;z?8uowL7R
zMj!guTpBv_+o)?2Il&Z79_kwQM-|OT)C)7wgLCli^};y%RknW;wZlu8ieY8uy>_VE
z(ixTU5txGRBpL%~EJrO^gNpbXDs^{IFEpNLGLVF-?p*Z8UZ^S`Y^^{Y<qN3imRomN
z-$w<05&d-kf1;r?yo$=eO;iAplT5Y8qb5v89YH46$0F33_do?Q0@H9jD)6PKdA6bE
z--F8Z0aWpw##GjKKBJM$fKzV&a)?263sBecKGdgom>pk%T5t<0uw598dr|KlMIF^C
zR85>iJ@<pP78SsMF;(~f8Vyq6cqW?+q*=S+_B#B90rU7h^ifl_#h6XM0zJ4Dwa_ut
z8K1*Myo#DPateP!VgioGg{a$c9rfRzoEB5fU$sVKG5s;9lvSZpy&seC2)4oRFch0s
znBr_{?S?AGk*Me9*zx@sPX7ezy>BoW|EM7Us&4PUnNMge>W3T*!y;7b2B6OJLDcgl
zsB8NeHpG>v4D7%ZJcRn<eTR+Ef0|i14po%ds0|fQBma7_+zz;?2{&T~9zdPtch~@b
zMxFgFRDizIO+ZoDnSLvL5T{`uJc*+*eunwC>8DZip2pT#$DL`;G8Y>&Fb;E2<B_-r
zwd3O$fZw75{0+4;@5k()4X7Qbpi<o(b@n4rH8Bo#q)(&fsl-ThSJ2QzyHPJ3!&E$p
ziu49%V#?#@Ob1~u{pYb2zK1%R>!|mgS>``x`J?8^MIF@$9Ewk%{!I8Bo9h1GqM>^q
zHQPMc7Wu&$gc`4~{Ux@)3w2~4+y0l>jQ(G!01}=sHPjrnfdb6Naj4o@h05T&n56rE
zmWEP%6PsW-V~=19Ovg2-8u%w_!V{=laSOE*zd5EB(y<f$4yXWUqXJuqI@-Oc;{FI#
zOBe9&fB&nY(VKy~Pnrq(p%z?%LAVmNgI7=!oW}zE9<@;7Q|1U;qpnwX)c8>Bij%Mn
z?!`2$L1iL*F8SBlx2K`V`=J(Gf?8-js+e}6cKjYH@)Ot&FWG+dJoABSj(UDHY6CMc
z0bNuEHli|m5EaNb^T@x7C-`ZzaAVZjC!rQ9LLEt8)DFhuL%0qT@h0lIxcTPnGf~yu
z76Y-19q(%$g0YN`w*9B(bA}!UDj8^ouVV}R1T*mt`e5b)Q#84#0J~!pjzy*VDLcLt
zqv=<n0y&N;cn+0W=kMm<9fMKx_Hk)w;X&5fm`r~Yw!{xnDZ7DwnDmSZI0JQmd!gPR
zhjF+NRm?k40Ukru#D7qkyn=c!@L97VH<?BZ0|j<qFzSVgsM>e}HQ_SU&Uc``d>>*u
zUPLYIS82{Z6}{+pK)qLl%FqzhQI(<Qf86};I?vMxU|=gMMSE=jF#6L!j`i^@>fU~Z
z3g9YgLcizCf)S{VG{qiRfZFK-ybm{^-mAg3cnk0T`+x59rrNt%2U<(56{u9sMIFIf
z48T`VJFCV(d=Inm6y{;wh2}4*1=xcAOw_H}YW)u;Q-4nEB6H^VqKaiA>bfk$;kX?e
zVEq@&2Pg`a+WRmQORxwRquxJ_I=Y*v42CW?{b+1SKO5`eNOZkvl+w@+%23yA28QBJ
z%*Vsn4ga+L&P&YBXQAGE9(6RUP?_3^3glm?@4;^vf<8-4zX_@sTP)@N>x{ZE@GuTX
zy?E3<_#<jUXPNobMx%#r2kd~uQAe^GwUI5hza3SCdr?Pq0Ph|Vs)$daGFrQg{D;xF
z%|H-_E;pazI8<PhaRfet`uzuNh}Td%3V6}j6m{=2Pzx2K0w0Jf-bYcXpM{!dJ9fl_
zE)8EA*HIHYD@^LcQ4uDiBF;q*_D2O=f&Fm-4#Ur}H|D=&o__}Q{#Mi%Z$Ad(8ElN-
zpaODl(r8a3eI*|g9E<w2?ngav0rSy+mHE5jJ*Xpk9<{(ejKudb3NK+6{)vUy{AKf{
zn}|*5Peo;}(u}*#Y8v4TY{F<ffI7=hQJ=^Qs6f6#-S3dqrkY!#Qr!jhTwm;jgHfq{
z37g_)sD-bfZbRT26L4c}q(A?&Xz0bRs6ghUit1(Tf}1fIf3V}%F`j;%wPq)YsN2%o
z+7)#~gHgp-hRV=%jK;;-2zQ_l>pMqj=)n(BJ3Xr((0iR34@A{S1gfe%n1@NIvmA;s
zI2CmSi&5W$*RcoIqW(;2x85A_DC|ssH@ZnQuFz1*BR7}`<4~Dshjp<J>bd^5KLb<g
zKaRz?8JlA*w#BH8eDAS8sup(QgLnzcF@KXel2<p8f2H;?13H@%s29$oimd)-)6YSr
zbTqcWY1k7tVJ7~DdM|#9srG)@p8lh#_jY0i9zg~C3*LkITV3-hoW0c)(^IIkT!gxg
z8&K7{4^<N%U^6^nf4_<<LjPCHJ#UP9KOR+dtx!jFza1ZCtw3MK=eu@bp&eLn`>&#k
z<W2O(lc<2sT5C`X-9`l%@~T-d9`$@as-`;G{{5&-_eFh>Mxp|A%V=ogxfp>fP*qxG
z`^QnK`xf<L!`DnT$6_4)wy3iojCyV!CgUCq!t>~hmr?8df`ia&+uaYC>pVn5k?lfN
z?;-Tyc~l1eL|vbd?dG|3RB`5`0`6rUi}mTxK|NoIdTtB);G3ubj-WDk2K{vZFVj!}
zzoNcqcWl4G>!v7U(Tnj^RCTw&d@M!nY#sXHE2z|0p)#@G_P;?LQH}K`swM(=FwXi;
zB8__3S_7Dm{@5LZZ~$uJQJ96}un1S8j^J}_fj3csr0z7|gKSjw_eN!4lyyAnxku1d
z%4X6~D(9h6vj&x_UDy$iqMoa}%PbUx!So9-4T~`ar(zJkjGFH?RFS=lE%5?se*Y>H
zP;?df*Fp&lXvevz2?|j!_CnRb7}SfiP&Kj;Rb;QBzI-Q9&)1@M?6ccsG7|NEIx65o
z+wYB<r*t>@52Z1O0Zp*PKClf{Jcm&Moxwo-8nwW$s3Y;(W4?_3sDN5x20nn9I2RMJ
z8dLEsX5k$>p5<1X2l`_=KTJcN)dtjquiE~3R3QIn`?aVuyoxHq+o%ls>^1L)pmy8@
zV=);O*uB^Qr=p75ol7H}#sbvBt5FkfLQS|G18^UX#3LAv3H!{Snt7<=osOY63tQtt
z%*LarBf5$?*l@oY?}|L<Ix}b_^1}{{$5W_c`Y$TQ(QlZY#G@9-!Z7TN4e<eNgyT`E
zc2Swyh`CsW+Sp|~UW>}WUl^eKA9%o=O#~+KLlG)vV^9x1ZTrhn8QF_zc*y?#J?g#d
zs4r*CL6d=e)RC5>-dl+Za1(~$2iQvY|1%oHG2l%T`2^H;n}Hsji`w~SY>fLc3O`2e
z^m|l_|3LkXC;Tn*el~jOw?}1m80t9}BXJG7Dxx=Ns8|kTGdzK+fvc$BZ=ufE=WUbv
z0Mzrbwx419g{U*{jSBcl)I3X3NBJ@;kPTQDkG@U*b!|RiKwq$*QK^aghdI;c)*{r0
zXb@`R7g0s|Dk`wOcKjgf{f|&*{spR7zeWXe9aZ(tA!EHm9Ebw&V?g&i6JxNwbqFr4
zO^>NQpI(p`>zO`&;zZA=QqRMs6H6;fANGuyJjGMO(BGz(PMKOAG-_o~P<BRkPDW0S
zCp*6&E4R9Oa<e*h+E$-`<dcqRp0df4CYAC+MTMuLWU6P><S7-NF-P~`oub53Qa<hI
R=JJP2rj%B1+4V^9{{VhB`Huhq

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 0030825f..61e462b6 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "inte installerad"
 msgid "installed"
 msgstr "installerad"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -46,9 +46,9 @@ msgstr "Återanslutning lyckades"
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Okänd"
@@ -161,7 +161,7 @@ msgstr "Vill du verkligen ta bort den här domänen?"
 msgid "Do you really want to delete this user?"
 msgstr "Vill du verkligen ta bort den här användaren?"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Är du säker på att du vill ta bort hyllan?"
 
@@ -281,7 +281,7 @@ msgstr "LDAP-certifikat, certifikat eller nyckelplats är inte giltigt, vänlige
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "Inställningar för DB är inte skrivbara"
 
@@ -311,7 +311,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Database Configuration"
 msgstr "Funktion konfiguration"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
@@ -355,7 +355,7 @@ msgstr "Redigera användaren %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
@@ -391,7 +391,7 @@ msgstr "E-postserverinställningar uppdaterade"
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
@@ -491,108 +491,112 @@ msgstr "inte konfigurerad"
 msgid "Execution permissions missing"
 msgstr "Körningstillstånd saknas"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Anpassad kolumn n.%(column)d finns inte i calibre-databasen"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "Bokformat har tagits bort"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "Boken har tagits bort"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Hoppsan! Vald boktitel är inte tillgänglig. Filen finns inte eller är inte tillgänglig"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Filändelsen '%(ext)s' får inte laddas upp till den här servern"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Det gick inte att skapa sökväg %(path)s (behörighet nekad)."
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Databasfel: %(error)s."
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identifierare är inte skiftlägeskänsliga, skriver över gammal identifierare"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Det gick inte att redigera boken, kontrollera loggfilen för mer information"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Uppladdad bok finns förmodligen i biblioteket, överväg att ändra innan du laddar upp nya: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Filen %(filename)s kunde inte sparas i temp dir"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Det gick inte att flytta omslagsfil %(file)s: %(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Boken är i kö för konvertering till %(book_format)s"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
@@ -605,174 +609,174 @@ msgstr "Installationen av Google Drive är inte klar, försök att inaktivera oc
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Återuppringningsdomänen är inte verifierad, följ stegen för att verifiera domänen i Google utvecklarkonsol"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s formatet hittades inte för bok-id: %(book)d"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s hittades inte på Google Drive: %(fn)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s hittades inte: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Skicka till Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web test e-post"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Test e-post"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Kom igång med Calibre-Web"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrera e-post för användare: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konvertera %(orig)s till %(format)s och skicka till Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Skicka %(format)s till Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Skicka till Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Den begärda filen kunde inte läsas. Kanske fel behörigheter?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "Borttagning av bokmapp för boken %(id)s misslyckades, sökvägen har undermappar: %(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "Borttagning av boken %(id)s misslyckades: %(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, fuzzy, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "Borttagning av boken %(id)s, boksökväg inte giltig: %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Byt namn på titel från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Byt namn på fil i sökvägen '%(src)s' till '%(dest)s' misslyckades med fel: %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Filen %(file)s hittades inte på Google Drive"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "Hittade ett befintligt konto för den här e-postadressen"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "Ogiltigt e-postadressformat"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "Fel vid hämtning av omslaget"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "Fel på omslagsformat"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "Det gick inte att skapa sökväg för omslag"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "Omslagsfilen är inte en giltig bildfil eller kunde inte lagras"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "Endast jpg/jpeg/png/webp/bmp-filer stöds som omslagsfil"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "Endast jpg/jpeg-filer stöds som omslagsfil"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "Unrar binär fil hittades inte"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "Fel vid körning av UnRar"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Väntar"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Startad"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Klar"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Vänligen få tillgång till calibre-web från icke localhost för att få giltig api_endpoint för Kobo-enhet"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo-installation"
 
@@ -781,7 +785,7 @@ msgstr "Kobo-installation"
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
@@ -847,7 +851,7 @@ msgid "{} Stars"
 msgstr "{} stjärnor"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Logga in"
 
@@ -1066,41 +1070,46 @@ msgstr "Redigera en hylla"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hyllan %(title)s skapad"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hyllan %(title)s ändrad"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "En offentlig hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "En privat hylla med namnet \"%(title)s\" finns redan."
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Boken har tagits bort"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylla: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
 
@@ -1181,14 +1190,14 @@ msgstr "Kategori: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Sök"
 
@@ -1208,102 +1217,102 @@ msgstr "Lista över filformat"
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "Lässtatus = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Boken är i kö för att skicka till %(kindlemail)s"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Det gick inte att skicka den här boken: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Konfigurera din kindle-e-postadress först..."
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Det gick inte att logga in: %(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
@@ -1380,7 +1389,7 @@ msgid "Upload"
 msgstr "Ladda upp"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Hämta"
@@ -1547,39 +1556,38 @@ msgstr "Detaljer"
 msgid "Current version"
 msgstr "Aktuell version"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Sök efter uppdatering"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Utför uppdatering"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "Är du säker på att du vill starta om Calibre-Web?"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Uppdaterar, vänligen uppdatera inte sidan"
 
@@ -1592,39 +1600,39 @@ msgid "In Library"
 msgstr "I biblioteket"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "Sortera efter bokdatum, nyast först"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "Sortera efter bokdatum, äldsta först"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "Sortera titel i alfabetisk ordning"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "Sortera titel i omvänd alfabetisk ordning"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "Sortera efter publiceringsdatum, nyast först"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "Sortera efter publiceringsdatum, äldsta först"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "minska"
 
@@ -2470,12 +2478,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "Sortera författare i alfabetisk ordning"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "Sortera författare i omvänd alfabetisk ordning"
 
@@ -2962,30 +2970,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Ta bort den här hyllan"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "Redigera hyllegenskaper"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "Ordna böcker manuellt"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "Inaktivera ändring av ordning"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "Aktivera ändring av ordning"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Hylla kommer att tas bort för alla användare"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "Dela med alla"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 4354ea9aa3eb72cd7758b46d267bb21923274341..305099604e1ba07f06d6757121bd200dee48c3a9 100644
GIT binary patch
delta 35
rcmZqM#Mripal;j3UL#!tLtO(i1w#`n1LMsPjRhGQEjNEQ5mo^J&n61c

delta 35
rcmZqM#Mripal;j3UPE0&BV8jS1w%_K1GCK!jRhGQEjE8P5mo^J&xZ=u

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 9d6781da..d1f9e372 100644
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "yüklü değil"
 msgid "installed"
 msgstr "yüklü"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "İstatistikler"
 
@@ -46,9 +46,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Bilinmeyen"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
@@ -278,7 +278,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Database Configuration"
 msgstr "Özellik Yapılandırması"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
@@ -353,7 +353,7 @@ msgstr "%(nick)s kullanıcısını düzenle"
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
@@ -388,7 +388,7 @@ msgstr "E-posta sunucusu ayarları güncellendi"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
@@ -487,108 +487,112 @@ msgstr "ayarlanmadı"
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "metaveri düzenle"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s geçerli bir dil değil"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "'%(ext)s' uzantılı dosyaların bu sunucuya yüklenmesine izin verilmiyor"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "%(book)s kitabına %(ext)s dosya biçimi eklendi"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "eKitap düzenlenirken hata oluştu, detaylar için lütfen log dosyasını kontrol edin"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Yüklenen eKitap muhtemelen kitaplıkta zaten var. Yenisini yüklemeden değiştirmeyi düşünün: "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "Dönüştürme için kaynak ya da hedef biçimi eksik"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "eKitap %(book_format)s formatlarına dönüştürülmek üzere başarıyla sıraya alındı"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Bu eKitabı dönüştürürken bir hata oluştu: %(res)s"
@@ -601,175 +605,175 @@ msgstr "Google Drive kurulumu tamamlanmadı, Google Drive'ı devre dışı bıra
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Geri yönlendirme alanı (callback domain) doğrulanamadı, lütfen Google geliştirici konsolunda alan adını doğrulamak için gerekli adımları izleyin."
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(book)d nolu kitap için %(format)s biçimi bulunamadı"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(fn)s eKitabı için %(format)s biçimi Google Drive'da bulunamadı"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s bulunamadı: %(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Kindle'a gönder"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Bu e-Posta Calibre-Web ile gönderilmiştir."
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web deneme e-Postası"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "Deneme e-Postası"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "Calibre-Web'i Kullanmaya Başlayın"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Kullanıcı Kayıt e-Postası: %(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "%(orig)s'dan %(format)s biçimine çevir ve Kindle'a gönder"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "%(format)s biçimlerini Kindle'a gönder"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Kindle'a gönder"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "İstenilen dosya okunamadı. Yanlış izinlerden kaynaklanabilir?"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Kitap adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Dosya adını değiştirme sırasında hata oluştu ('%(src)s' → '%(dest)s'): %(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "%(file)s dosyası Google Drive'da bulunamadı"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 #, fuzzy
 msgid "Found an existing account for this e-mail address"
 msgstr "Bu e-posta adresi için bir hesap mevcut."
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "Bekleniyor"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "Başarısız"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "Başladı"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "Bitti"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "Bilinmeyen Durum"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -778,7 +782,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
@@ -844,7 +848,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Giriş"
 
@@ -1063,41 +1067,46 @@ msgstr "Kitaplığı düzenle"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s kitaplığı oluşturuldu."
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s kitaplığı değiştirildi"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "Metaveri başarıyla güncellendi"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Kitaplık: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kitaplık açılırken hata oluştu. Kitaplık mevcut değil ya da erişilebilir değil"
 
@@ -1178,14 +1187,14 @@ msgstr "Kategori: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Ara"
 
@@ -1205,102 +1214,102 @@ msgstr "Biçim listesi"
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "%(kindlemail)s'a gönderilmek üzere başarıyla sıraya alındı"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Kayıt ol"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
@@ -1377,7 +1386,7 @@ msgid "Upload"
 msgstr "Yükleme"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "İndirme"
@@ -1544,39 +1553,38 @@ msgstr "Detaylar"
 msgid "Current version"
 msgstr "Geçerli sürüm"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Güncelle"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1589,39 +1597,39 @@ msgid "In Library"
 msgstr "Kitaplıkta"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "azalt"
 
@@ -2464,12 +2472,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2958,30 +2966,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Bu Kitaplığı sil"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr ""
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 62855c0847be892c5299e2aba81e4e5efcd1c2ee..829add92e69edee8ce1f7ba9b1c7398607145f9d 100644
GIT binary patch
delta 3573
zcmYM$3(S{Q9S88k#TQgAauMEym-hvUtHd4Rj>u)KcStZ8BId9w1VffHsm9+`IzpT}
z0TZ33vZ$byy=KHpY%Uy)azSY%G8lw9)Y27ZBiHBa|Jh=Hp3gbw|2*gSJHK<DKfJZA
z-D~%>tDWrGaYymzxWE1VJ=>7p|NrdkT1rpdAM+AE&n`Svd8`^g#mkJJt9+N;^e?hI
zFW2eIeoTKn-Crx$X(aF>y0?6p3Al+Pxs4y=ekQl0?8M{Dgs0h&AFvlcWD@KtN)l@3
zP>x{cTf!^3nSI4C+cgqk-$w&hMst*tOu)B!75~ZA?0!Xk;*HGsH<*MU;z0h0KIMo@
z55C50_;;p){S9WJgV;^{GDage&T?tyr#XNdIf(Z&iL~)@9;iG-pK`S7pJi754|e8%
znF=+?F8u*a!b5o}=dhL=S~XI_&#@oZFd5!OpYotfCjLHCsWv9T-!l`w#Z;`5`lsZ5
zIDrE>lglZWvV*yA4>RAhz0^N@@j~^*agNY`gIQ^>-t~l<nT)4Z{dr8F)y%}}m@~1N
zS?S%?_<fXHd4hTVnX3OB^ZXxstN%2O69#e!8)egn6Pd(XU9xAlFkA2?rUDz7fZt&%
z_W;{-CsUb+tMUES_^&y~`14%C4uXv5@|s36-pZ8bL5|~-9K$~|Thd^krg9J`^Cl+n
z4(9n?bUw>dm2FhS@&YsOD^>p-Q?dV4*19y-OEZAklVQwCCo%!1Go`wg3DC;y`6^z`
zuQCZdLPadQnb+-?9L&?qRyHVGD%aB`aju~_wK7E`hix_!Xi?R_f!VV!atb#x71+y^
z{u~qd9r~2_U6ObY*=4>)X5~ZJ#EH!JOR1=3C41!k->8wyzr|$wT_*G0On}2oDUVXs
z%DKu9nNs$#Ke=xh6L2guKASCE!p#2_+WxYIndh;X_y1XqJn#qR##2@QU(5rYoXlk2
z!~_`39Ln)b#isD%oXc$4TKcUi8<_j<WZr_inX~n9HGYJ(1U{+}&oX;_p|U~UGEpC<
z<U^Ug8%^6<rZW>R<1lVv5`CK4g8j_>hnVM&F>zjHD)4rb`loS;cP2J5rJTrQK9hN1
zF0+E=RQ0lk9r*2Pd<zrsk;)%d{(`yhw@iYEdA?mK?=kUCwy1v^7h3A4xtkyG(fZ?<
z(%!<H^7S0W2k6;ykj*^F5&V#|INa}bDzb*F_$X)a17@DdE{l01hjU*|BY|FKN_CnE
z^iDP2-$^ug8OnUWkU0~}IgjhOkUwKyyNjI6!45<cTE&Tclw*06+0u?f>hsjD)YxZW
zBvazQFgKp3V^EsRx`b0Hr*bb-p{Kc=r<p_fN%hq%3-}3cplvRXaSDIM)x5x)xx(@#
zQY-s49Q1OSDc#?gpT<UY?aWqQ%4JNYZl+IJ>yr0)2R%~uu>)UbO8!^oZE74@|L1oU
zExxQ|61?-H@meWA(U@f51XHqJ*H{ggaz3{)6CdLazQV0sZ=aI*znPWxHf#Fhn1mKF
zTXzRjsa;G$@6vH74a(Rgei^RuDK20R<AY48_cFh1FEN#PlRo7=mu%IbG1c3`Y}rgE
zfm@k?+n5!f;XGdIrWRh$9O7G9yG-LgjRe}o9(;xgc!(YO60hT*s(zz=YOmkK+u6dk
ze2CN8-u`vrEaptK@(a9;EBGo?;RzG$|0a#~6Y7WJbtdovM>d%+W;1VR65UyiKf(L}
zy~q}xVoKW1K4vQh^9s)42rgweZe~y3%iQ<9N$T&7DbE?mDLuoR*yJ5biN4O6+(j|U
zaav^QF8zEzhuNyt%-eDo6W~eq;Lq8eFIN3m*j4{c?&142joliLi{6QIr`9Xb$~F4S
zn3W%70{o6Ge4P#KJgxqHcjnMt#Va|NDg8?J<u|#3yV%If?9*b_uGX;VavSAR_A(Ql
zWghG{qrT!Hl{fH4<J*|G;|+Qt%4lUuWma(*@2mRzxk&#!9sDxYE0!%;Lt9cS+claD
zJjJZ^H_U5tgrDJQ=1k0<T|cA?nf_;)=ho4&DO;J+A7r-VDDz8tfh`<-ZT)v;9y7j)
zJ;g73GzJ<tKtBQH1UItt9RJ_r*Vw`{%%SY)Rp`eN9K`ud1=cVX*jag)S?NU%;Ly4C
z=jYQ<S;x_NFMq1BfTx%}9cD14&zCvH3)svROyE11N^Pg=m&fO|9q78TYuokxT03?f
mH)_n-QDY{xjGZub%=oq+G=IKbyD4qm1`h4tcK?hMo&N_lHEllt

delta 3689
zcmYM$3v7;89LMofy596c^=8%fX{|0rwMA*wWxBE=)^=mf6e-#%HMB;zZh3WP;*wg@
zuuR4X#!ND_?$r>xU{P;fnoSrZhUpfUMU1h1e|t|ddHa0MInVQ)|2hA2&J&kcdbO?c
za{V0Yy~gnGB7a@^Yx7a<|9_1^#)MKmg3qBF1F_Y5-L~Jw0NNi~y@HM5X9Br|U^GTz
zZ(Gkso_Cp7DJbw1<XuyZ3b-75<7e0fPoTzj4Sn%8s>6Hejs8UGjKQb@CZGn?4|`xH
zs=sL%j<py`e6xju0yO^Dz|4?7%^#?MPw{#5?r2Og#-Tc{LA9?!4R{;I<00f{E^+CE
zzhfW#2bIA-G-{%07)*RKf`T4=g-aY3V=UHS0&YYN<T!S~Q`T1GXRg`$pQxE@G=30-
z%20%@C!+>D2>r1DU3#F1f>O8uqwyWo2-hG#vzd!J-iON6ant}WqdNQ>m9a?jugrAE
z0ho%zuoN}Wt*Gbrqx$=<Gx^tAoU=D>V-od8sF`*P^9-mTYQ$r0eF7@bd{oEpq4q>A
zYUXQg`{&5m%x={C-`ILH>iu8B$o~)uZ8T^T_GB~>n1dQv5f`ml1!@VZP#JKc0)C3h
z+$L;?U!XGcrENc9+fU<2+TB=yoe9z(OI;K+;&rIhY{oR)gDH3ewImU&QzoY2Ae@5=
zycPBS4rHI2dh2l{iRK)t-<!7n5S6ijD37kL6qK4|)S3)N%`^uUU>qt{`KSOzs5LLg
zZnz9JfUl4wng-NyJBcsgJ=9W0kTzv5fs5i~A#q$Lmx4B19xBijTQ5TmY!PN)4JreN
zQK^533j7TD8DB=Ffyblz>xr6qI>um*y+0jEs+onIbpC57XykRMk#0wgya5&9CsZo0
zA=xtzt--8|GSD5B(lMy#i%@|}Z2JOqsDFftvkln>rV%4`{?Dp_zo9y6$4=CPVW@g9
z)C)sUGt5T?C`4_}H&L0JgNay$TDlF$H^*#7J=cIb4Tn&B>@>P`L-|o4A8Qn9t&^;o
zsE)><Qa=f`hSQPdHS<s%F2|nOh#Ke()Kaveo_~yb-<Knzcp<UmUo(%VL1tL<QK>9L
z4X^_BLKSKTE09$%>#;o^u<ebgfM=|it#?q*{e>FfQ@rEF(#4T~1rFuIEt61dIuiR~
zDJr#VZTlwdOZ{7<5Ay)yFqH3f5~ksBoQ%rIdMrXW4#mE7uKs6p$-~ty3cV;?MFk3A
z=P6a;s6Yv*_B<q(nPl(3kJ=L}Fb6kcF8+!-ekqBb??fSLKp*2kbYm*|boVT&YcK_M
zl#4rYDk{Z+^r8pjkbPqEu>jvf&EOa+LpN|DhLcxq%5tR1RAVx3MwZ>2#SFZQ#hApb
zr|SH#qM*&yh8zI%6qULz<Wrx>ap;GO(I1y%0M;Qtvw@4w^GW1Ya~0cTKyOdVgHfkx
z9QMItBnhS#lXd<Z?2YS~&W(;drId}v!MF@Z;Zan_zO2g{?0_q96Kddnn675}GOAvR
z8qf!*rQ3<hR5NNoiKH)q_$HHrUYv|$u^P1*zelC|3hE2jKE;!X7^KN`M=jMv+g^rR
zvI^7ywx9wYMa?*pn>jcX9bAGg?cyyI0`NF0P&0PITd34OMsIA-x@4mtsy+_eVLmRz
z*Kij8fLWN%`UPSoYELZ2QrwP(7&3tTE5$Ph@ShIcglq~E%~n<5YShR-#5ml68t5t8
zegX9XdV&syv3{I1GZ2;0LhOhOF$tGpFz&%nJeE%W_279LI63A%YL`Y1VmUA$m7%Y3
z7&arZOc0}Hk|rB<e<5nA)}T(yK~#WNR3>j@2tKj(4g?9J9^<00jY4nSg6Gf|t1>+q
zSd3-Vm!oF>02SaFIv72~^Qp~3-OomCy73r}RjAb0VkGXvx!8<R=o-dC<xzMYnY`JK
z4ANY|H!y0br^8BA2kTKY-)p^vlc-0N9-Wd!$U!kpsORn=N8ZE^_tZz@c<S#W2f<}d
zQqbBwLaj}=5uPPUL(M1;bzCOl6r6|J8)vW!{%Gs>F^2jRWE+_-FM5_>JZfo*k&|kc
zqJ#C=U+4e4z2P^~^Flht^FS{0Nief<K7N8T(VrvWU<GP()?qXr#00#6%D^L31`=QL
zScsbFN{q#Qm^gvL1qwWCo}kY4a1QBcoQpoVAC>wh)NXFYIJ}7p>`UI2scy(>nB-CQ
zJA&p1#X5`1%FCT;CC-eJ@{$E5Gn~@76;3ftZ&#L7RMv+_7kCGy_DxOeo0jIJW@M(M
z*Dr`G@$wp6f6?jDb%f*I-Lk~p;NI)Fn_6mGK5*~iuc>93`-r>Aaqn>-;NC9xVfS7d
db~#iIx2&d}N7uG2HSTqFO<B?PUPCYW{R=PUqv8Mn

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 9a4907fd..733687e1 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr "не встановлено"
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "Невідомий"
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
@@ -281,7 +281,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -311,7 +311,7 @@ msgstr "З'єднання з базою даних закрите"
 msgid "Database Configuration"
 msgstr "Особливі налаштування"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -355,7 +355,7 @@ msgstr "Змінити користувача %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -390,7 +390,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
@@ -488,108 +488,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -602,174 +606,174 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "Відправити на Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, fuzzy, python-format
 msgid "%(book)s send to Kindle"
 msgstr "Відправити на Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -778,7 +782,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
@@ -844,7 +848,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "Ім'я користувача"
 
@@ -1063,41 +1067,45 @@ msgstr "Змінити книжкову полицю"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Створена книжкова полиця %(title)s"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжкова полиця %(title)s змінена"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "Сталась помилка"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжкова полиця: '%(name)s'"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
@@ -1178,14 +1186,14 @@ msgstr "Категорія: %(name)s"
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "Пошук"
 
@@ -1205,102 +1213,102 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
@@ -1377,7 +1385,7 @@ msgid "Upload"
 msgstr "Додати нову книгу"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "Завантажити"
@@ -1544,39 +1552,38 @@ msgstr ""
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "Перевірка оновлень"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "Встановити оновлення"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "Ok"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
@@ -1589,39 +1596,39 @@ msgid "In Library"
 msgstr "У бібліотеці"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
@@ -2463,12 +2470,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2953,30 +2960,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "Видалити цю книжкову полицю"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "Книжкова полиця буде остаточно видалена для всіх"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "зробити книжкову полицю доступною для всіх?"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 3bbd44758668b5cf44be2dc9deef7cb3aab922ba..dd3b6cdeaf3d2e8283f0a1ea9060e274b1483b94 100644
GIT binary patch
delta 12022
zcmYM(3w(%W|Htt=o6|Oj&0#aAjU8+@HglR|hG8ob(?S>>6f4J?<E>&6Nsb|>oKK07
z<d{PVokT=Mq5~06g{LR_f4;8Y>-F#Tyn0{1>%Q;n`dz>4y6^2-?@tamR~X=b9~L;r
z<DW~#Jg*wI3s?02{|v6@dFsl?RGfshaXTjAS=4i->U&-o#-ie;7=<~=|Gek<R~)Xg
z_){$9dA@gtMh+KBq<CHr?2YMIgiY}(7RNYdZ;eS<5(i@djzA??fblp3gYbPUiw7_S
zk7GqVhq~|2d;LDyHgGp4pl)o6ny@`;plq`TYQQ`!heJ>aOhDZ~5tYcR7=~}7?%ReM
z=MbtgUtle~ie;GJE1%{bsDYJ;Q?V*`KqWK)BXJ0Z;Z)>VZ!wm}FRlM9Qc~|4D$!f0
z6_;q}Dq0m=5a-~7I1~MDG|tn=#)geNuMbYZ2k;!$#iYib7mc~7%tvEoT!cxu6_xl8
zSOsrk2@GxGdBGTg<uL}eb&W6_TQ*_;Rhk?+0<j-fz$Yvog{s7OR3#Q*6s|^1bQtyg
z1=OBiMI~H`gTt}$+Mp5~hRtvZlACu1wPm5{)L#RHbK;V*7AD|Bs1=RIM{ov)<1eVK
z&}fRQViioo>i8f=;vm%ZLW>upwqyrtL5DFGFZwi8s-WiX!BAAGldukU#u$77JK$Rw
ziWgD$-9#l2!NzLB2AGFg7H>d}e-QQB9z`wqcZ@{;ZyGvOm0G$(QU`Tv`=cfphT6N?
zSP@sE?*9Ol$fwu_&!I{k-O81=GiuAaqYh;rmceI`<K`70<NDr48oY|$9@GQZQ4`%k
zJrKrAua!rk4%0wviz85b{yyqZp2un!aKB413R#<%h8lMWY754p5}$^_%<nCxp%t$~
z#_&EsP5d|V26?4eo(^RTR00p74r_0$jCrUnD8QOH6II$RsLFkcHSl{>qIWPFqcYeU
z=JzsaXy8s}4l1EMRHj2wXW?ah7&l-i{1;WJPLx9v_Cbv^3YFj_i(f@mU@n%#<*4t*
zdh|8GHX7QaBdA046(->o)Y}lz&Xqa?b>B0niVVjHoQ$f(Qq+pKqqgEODzQtb3BC4i
z{2<g;)M`)tnZrx9j*+N=CZbBY5LLRJs6@`7N*9>vRv3qxpf0LXnW%(vu{I7xZOt51
zVw<ok?n7<yx0%#mE4fUE-uJs^MNXVDPDGvdhN#!31FDn{qbBT&nqVkuoT;dZmY@=U
z7nR`Ws1;vEjq_hDfq{NUH&8Gtqw1&u>Y}!$1uEmNs56mo*T<m}nT|?yA!_ee+V#z-
z3HO^{TK{=0PX7(mR{OVTG^A0klPi5Y<jwPXnF~;fe1i?}8fwMSS*|k8QI+V7ny?=#
z(dSSJ`dA&OVGyoEEp!|5obMf=p;Da0c>ETVF)-V`ehpA(;YqB6g&2pM%&$=s+%c;@
z;7Xs4UFgq6ZS5L-5ci-G4Izlv`(KrY4qaPJ#-7MI^IpMN{0vp9KQRPDI=dBD!9?P^
zn1DU76i&cEoPt3(9g}fBYHL5nR6LE%nBNN`%|_TBgK-RMk0xUod<~W0Ley)u1y!lf
zt^XD((XtP@$}~hx)C;vWgHc;J9(9&xVK>}_z6J{D>L#d*x*-GaeNfC%*qr{^s1<#I
z+Oo5#gfF00e9im=b>D3)jRAbMG;SFzhY467(;ue(8X$`f9l9PEigS>2=B-8zbi?}p
zLG5K((l3iKsMjtHbtpTa63;`OiLt0HTY%ca)fVr?7~*5ysDBuZ8+0_q!0zr7*%DRy
z_NWB9p)&7-TFJBKt5|_}6>|Q(5AYEzk>eK72eoBuP|qJieV|TSe9gCxyV!sW;XT}s
z(=5~>oQBH$IO@xH8B;NYS?<SHs4tz5D(Q061Y0p2KSkYt3Gc`7Tz5!wQI+=dXs80i
zQF~R0TKNp?UyM48n^Akb9d+7wp(^ncYM^3|x=K|<osF8vuLNEk>g+s@s>D)^z}?7v
zzV|ha%5<E^N_Y#KVws+9k26sT<Y0a5h1!y-sEOvH&d?%Mh1Q~0eiW71kEk>77wXIu
z>*dA^#fp0W!)a9ELK5oGWMWBt95umUtc$}j4VR!Q@fE6Kr&0G`z+!kAmFQK}mQ?TU
zR$dRaz-&y!JWSF1KaEBd?nZv3d*5R-jDF00$$FzE9D`cf1k_62L`}FFb(+^%{5k4O
z97m0J6YF7mAGZ|)kr&BZfxcFBi$*7`+t-zLBy!HY38>S33bm3es4v_<7=^|AIpa{J
z?|@3|Y1CmZz&5xZmC#j8!O%QsMjrLor*SwPHE<a!-iKB38fIcpe^-&N*o1f*sv-wb
z34MY(w8v4e*?IH2UH1mK3YA7Js2=J}WDM}#9(JKanLlbb3`8BCv8a_#w|EI^&o`q6
z+KD=hpQ9!|gBtiU>g?RYig?$o@VL8P$86-&(Cd(aIz+wf!T<~;9)g-+B<hq;K;1tL
zHQ`Fs1luqYk63&OYZL#Cs!)w5+<oz=`&wWe`j61i&w%k5gR4*z9Ys~(6lx{ET6`Tl
z5*K^Y{aT)lN@N!5En1GMz;0B9j-VFyJu1<k?E3$Ziu+!vr`&_#s0UK91h%*M0o301
zv;JpM364Zf^df47(^2=$Lse|0#qXlFY!3$DVNAzk*i7$#iGeP|HmHF*VIV$?TG1m|
z9EYMNcmcKIN#-2X*;$F2Xe(*~d#wKuD$x_D=YO#N-|^n>|95F5a-sOs?zKrl?a=_N
zh2ya_E<+`>9yQ@1td1v86aEKF<9|^T20Y`wtmRQ#8IRh6bWFp}=&O`3(a_#c$5L2?
z)o_>fe}meZyQmLP*dS*jYTyhkiQQ3^>uvpcsPTrQDmE7Nsh@`W5-uM^{k4)EbZDT%
z7=>q0nf?zoarwdSff!T*%~0Qmhb?{<^;Q(3##w@zXftY@!>EdWXV-6|5(vs?|AT2n
z<-1IiP^D~yjj#pkOEwIXa3waw<CuVDo^>|C`owwW8<<G^A=bg)P+M8)IoID5>k<#}
zX=tF=F$#B}9yo(aBw&c!s~}X|3d>@9)S>K-LD&<u1y5L<kGj7A%b}0a_&UboW=vN9
zDH=6t6d&pmh((n!6ZN{}Vj1j>+S_N$=THfZKvi%wW?><g$1kxJUO?R!J<R={5sxXv
z&5%RrdxL0bua=<R%lEJWUPqO%_Hg&Jp);lu=c87z1U2v>R0WQr68;)P@r?N!sseY-
zvLoDrYhZc3|E*}~hAybg`l3oX16Arb?fPm|Nw=d8(;n38_YLYW-og;9Fwz~yDAfJw
z7=`zv#>+!he28M^_h!)0N|&Hkegt&}?w|&Ud)~c{$*8T!!g$QZ?l=K8@kvzT7qBv3
zM%{nk3$7yNP;XB(>N}B+zA|r1L-s}O@fZxp3Fe#TyQmc$M!nakP+M>wRf(Ta2?Q3n
z>mjJ|DxtO{617!H7=}#>sJ}AFqC;;%cU0!%Q3K6EO|S@6^5v*K-h=gUKdMqUFb*R}
zxq;iDR^A;eVt-7>7p#9X>d@{TMg5h)Q96|ANz@9@*p0uUw%``(RNqD2S8lXhNkvp#
z6O~vDDxo^43Ux(Qrl(nev+m=URt%><(I4ynBAJ0Pbc{lM7#5=*Jc1GU3)aT_#yMlL
zA#o?vSr~7wLQVV`X5cBz#K`gPJCbM4K`qSx#5%sPjzB7+3&E&?!|>kwiaKP2%mUO~
zGYR!!nS;7-yY>HK-Zo23aL-4eo{L2)?|Y4CXu{U02{JA2X7)rKmOOKWIoVu*s?bKP
zfghpnzhvG<O&I*5`vg}-&C?32>iy5Ap$DGAWE_o3XbtMdO&0I6_yFquFHo=TkJuQ?
zzT^&BdrTwt%_3|;{Igw;dD&I04@NM*H$e@Yk6OVN)am{bHIX;b{S>T#N-Q3gSUuEh
z)!h0YM2*wkuIF3-Xp3L8csf?$zB%aMTOkd-|GTgfo<>b{4Yk6*Fb<<8xs`Q5RcZ{j
z!L`@~ub`f*UFZ@_#8~1cn1qj^5_}aq<MKl4uL=J{hb%SOS;K6IN-PWY;FH$xqxN);
zxzet0L*4(G^<PH4W`AQ8hP~n{n}+p?`@cf{(`n44Lm!G`7>Pfi2KomzK*SW@WlTXO
z@)DN7g{TkK+ZOMz>-$h!^9|}OTtQX3=Bw^go`i}!`82f0Jx~>R+El+@r#TppAE73^
zhWbGLWpUtC*B^|D^oOAaZi%UwW${?7Ks?3bMW{pRud|Myu`L~cq9$xQ&8@T_sv@IM
ziOxnnxEe$7qIm=L$-Rr(nvmDr^=jChI05zi6R3q1APe@rwKU4mu@|+%Pf-J$K$ZHU
zc?b1&RG#hzZiL#R46_gF{?T@Qmbnx)-bO5gyDdJ7_x}EOmPQU20$%68e&VC32Nq)t
zzJprnSEvNfn?GYo;%gS)H1D8R8aTt<AC5X(HLxb8p%&5&qxJp|qoE0AqaIv_I&@pH
zEFQD#XHhHu1$9;e-*C@GqT+be^DR+_?jgHA5%s>mfvV7YR00R_-rxUzq@njTc%~aL
z6*XWh)PUX1r?49FXw>z2*1r*z*gh<W-&+4~=D%jxEH{2E>iGt<*nh3Oqg}|sFyj8^
zNb?mePya$x<{MDY9W_s*w&s%g8)}?C?0SjW?*0m>{wP!>(q>bC4fFsV%KTBg@oDpU
z^JUb7Gf?*}xBen?AKp8>sFj_-)_55!V&WXPC9TcjsPD#VpN2l2d$1DTL`@Jf*CkfX
zOfVapZBYq5gr#wS_2*mvXjDS4VJ)1E$++FTgsOmFVV=7o33b}Lm?KboI^W!eI=x@w
z19$^fxmItwUof&!iO)oRKi)<ix+7R0FQUFL73aHoa*^x4H;#q|nul7^3e*7GQG0z3
zwZglo6_r}x?k|VBUJW&IbJTO$n1;i#39h#5=TOi8j+*Z#R%U)LV4-{6B2lGkU~vvc
z5a(kk7NYj@O^Y{Lyces|e*(MUb<{ZbzvadqfEs5E>b}|LyO_rO-Z2_M=q+*?2BR_z
zv$&=iXC~YAhNud(vACa^k6P(yOu-jXZ_gI&h6hj;4PQ+CRk~;z$}klbXQ8&Dr<rfp
zC!kg^AC=%X)S=yP@o9`EzJ!{f<Px_Pp{Te$>bWi$jJ=mof0cG19TjjiR>tY5{*|b`
z+>V)e1yixXQkU@KsDZ|zo}YrM<Ra8KYp@RP#n$)>HpV*3+~MrI%y*}H6df9PKI+D!
z7>&ViyMdFj8gUz}f_<<q7GMUhK$ZMwR7I|#77)1H^;br%yt<ia{Y`vpv_hTU_NcAM
zM?Fwz&O()NDQZvGVIw??;TXEYO_+dst~qL)j;O87LsfDFD#10Vg#A4<>eD!cdhjp1
zP;8}(OJfcCE29Q%gc_i;U4PshiW+ddU7v(XY$58oBD;Rf{0gbC@13Ec%>F^GFlCjq
znb{6CaA(xYb5Mu05S7SW)CxDCzHoa{<6X7u(W~8aO|Uur15pXBzyQ7fyJ={k4^fBd
z6qdjru_j)&IB1Rg6)O~#NDI{A%C~qfW)pvm&9K5+7k5Tgb^-Rp)u;s&TgO6~-wUIm
z39Df(tc_8ai8_Q&p$3?O@i-ULaStlN+n9h6>s_3IdagfeVG~i6S%6ykVY~hV`noY-
zgWKa+R3h!LG-jJQsEqq!2tH?yMI|uB;<e^`<^l5y)brn&S5dF)oek7qjnIv5!dTQN
zw!X#fFod|X*$b86K-7KDnG@~$d~+4*@D-u%KWhEQEk0-QPaCPfCisI6z1QA5E{;T%
zE*`bQmZ(Ga80u{pf*SaB)XL^!B(B2R_#x_yTtXej%A4E*vrzMOM?IhC(<nz{AZB9$
zcEy9J2`j(r5=lVa*BaH|1vNl_>wg-xWus6Nyo}oG8L0c$qVC^?TId1Peg1cL;j(qy
zFz=edo87O?5oR0)@nA!<HEQB4Ou_EvBrHSx9+t&}s06-3ow+kE_Pu{-Xk`IgoE1=|
zuWfNUYJyIv0lJ|w?`b}TdVU0k;zZPab5Y;=Mdk^NAr3BbreJBk|2Z`DQ>`y*pfRWn
zr=kYhh?;P#`5~&bpJ5pOjC$^GY>Gi!UECHmVK>w`1*my^Ou&Vxzpi+PXz1{qHvd4a
zr0g~~aTIERWYkZ!hSr~rN+1_C@E}xTldXTLS!CBgvg;SD|9|LffU@tofud0ZG_?3Z
ztVG<;;^)mN=3A)4w8`R6%x_T@`yG||KW4yo_u&e{Wcu4}r~W!L!{}&?%TXmeWBzN#
zyzlxup%Q);mDr1@mCr-HmPHtW$IUC&AGpI^uZ;m*&p>T)<__ww!!?i&WjqX(v2Sr9
z>iR6}Uu69&Pzh{CP53b?f%B-n{TH>R2_LwL+M&jO5;fj%)R`IQ)6j&k*$uPJW#&8B
zk?T7x4&3Q}K?y}Y*A+EzE^6W@Fcx1&Rcafm)Q3?&J8q)xtFg-^?suf2jy%)@Q&9si
zMh(2u;w={MK)uf&nI}=tT||}i7V5bwyWL9TP!p%1#?3`t@9Xrv!PYSfRl-7ZB}Nh-
zwCm?kCI1aIP_aF31*K5~*0Q)hs<a(35pz)$co}uJHlyzU8t?u6??>zS7xh5MUibf0
zn&7?f0cygjsJ)(P{p+y`@lGs{CsD8MPpFFA#u^yB&rO(!)rp&!Int+NI1Nqo2I_Du
zLuI%gtK$2p1WuS|QP(e^Ci>mtVjsHxa;W}ls0G!xxF>4-eAIX^psy8;w~l$Jy;^L3
zgwe#;Py?3V@3x>eDuHxN#Z1%!3a|{mf|_V9YNDkUuQoSZ|IYpVR<D8gTgOS%z~5T@
zt9c!@hqo+_J>a$?3AF|7i$>M^zD3cPLF>wuX^@<fnw-)&Dz#y=l(eD-W8&|-FTJSe
N*lSIT^0#G|{XcTHdVc@_

delta 12100
zcmYM)3w+4c|HtvK>zHkrxec?q&D}P)F`4^4G2|9MWG<2WJ$zll6cR=;v`7*|Bex_W
zcPbURBytH|L{bX>*L&ylc>H_x_&v`#-}61^b3W&s??%7Nvvcg6lf(ZZG-s;EKR2>_
zUP)|MRJH&AXL5DVQ_~cT#Z)Ydhp{T&LA_V3hUbN1ZB)G#Mq)DZuQ!|jsem6_{SxN!
zJl_kB@w_fPD1y)9P^^asFdiRcF08}siP!)Ga5Cn=S5X0`U^Kpifp`Q%@C*jwRSd)5
zQT=kpsoiH46x6X^Rs)fvChUS5sHZsq)o&!`$7!el7NYtuK?SlLL-8Y2zeA{TzC~r`
zM=XPnF_`(i$eQkj>R6b1V=RGPQIU_vaGZvrxB_|C%fP&N#oF&6DfOP90u89;R$K&?
z(JI&glkr)67yV8Y?ow!r&1!pIZ(NA&@OP|&4eEGa6b?c~{u&m+O{g<)5Eb|zSR4cD
zdR}gf!hBc}3t%nO)-}hX_-tMBuhb;dkP}B>AslP<xu{GmKxJYBM&b_CMCVZN-$U)`
zV^qN9IXD~}uOlkJ8CV}TBQbinQCk*OkNj(ZX!27H<FFF;L9OUD?27MTQT!XV6$Kbg
z^(t5#n_?;Kh2i)L>iJTuXP~y^C~86Husr_hQ&6hH6WohYs8lz=ir5>=;T&v<8?hk%
ziRzb|4OIXYQ4==7zSzU+pP<J726b&OpcecT!_g0X#vQ8i$l|<s)TteXnqUTM@77`%
zZbu!$W2itbVPpIqmFn1rF15W;Th<?SC`V#2PC|~Gmx7GzdwVHxCB0Lq7j(%rQ84O-
zGN_fupbpanY>Ka<_WTIyP~OFoSg4T;Fa}wq*AzAGG}IQ%M+KgS`E>s?C}_pIkukhu
zsEGqv7B|T&hB}n(PyzHo9oC^(1V^H_AO%a~yQtKDj>_C6jKJSefd)5mnT^5R%<m;p
z(7@fzWK=*SQISqZorT4igr8t*%ugDWsqUx=hoQ!qiwZE+>dR3XScd_aiTZBrL0<zL
zqM$uGk2*v@VO9JWbsH)+bE!^3^_zss$V@DT%TSrvf?Dxm)K;8B1@-_nVS(mu{BYD(
z#5E`X%;7b*hFPeAmY`DkAu4spQGwjXC=6@iR#*o$K>{jM&!Ykwgk^C$YHQv@1-1`M
z;FqW^{-p)^*GeAIp!*)eNt5MJ5!XkZ_GYMS(-oD<ey9nDqb8V+8fOJ+qRptlKSKq0
z8MWd^sB!YPa@R7<r=WpKpdzY<8Xy6+HSJIl_eGtFDfWCmDv(vEKtDw7{dRl4A2s3E
z<`rwdi@9je*4k}_A3&iN4W&`3?~Dy`h`9k3$SsV+C#V(2wsDzhi&{W$)Py5Yf%>Qb
z-@sCshJm;nwa`Pzd%kyuLT(zaV>JGP)iA8ByM9ejXJH&x#HCmP_n9|P69l(&Rzan{
zH9m)fP+PhapT$$CKuc1I*8Q(SK`ZZs)$k?coOy3ydHex&D{{7XD=LXvaV4yb30MgS
zU>;nEIq_`_#8s$qKR|8mS&YS>u|D&A;e=TmyI?+i9koZxFc?>&0{jqltv*L(>aw*5
zbZ~)2pfb}8HPH}Mpp#KsxBzvQ)?g>xhrR|X)X`0lfa;KhSsxU0E+){v7PX=uQCoHg
z74SXOil3M{_)4i?9?Xk{P~(=u{8$eQVCy9EuK{|{phGtR3*vjoIrDa)2FgabY7au~
zWdw#`Ei8mhQHQcCD)5o0GcgZ?a06-!cUb*2mZN^L6ZsFNkgc=(Wit!|s6UHJeHT;!
zFQOtJhFZx~b2%2G{xNb6y<^xFi*#`d7>3%iov8P}MSY;ITm6Y|4I$6F>lKasobY;}
z4q+N9@~fyX-y@90lFZTw+oQg8Z=h0|iJIUb7R5`b{tvJbMt5_EbPy_|{zwYSz)aL$
zEk&*T9c#}(9mf5rJwA*&?I%!~_zN{qXm^*Xa;URW1NoJ}tAjc_V^Epcg2nJ8GN13=
zpiqQ{yI2?ldbq79h1%oiQ2``l4IF~nk`<_l)}hYOCRB!Yp;mqY71({$8OYVsjTed<
zFABqS|D!1sr=bDr&^(Vi17lDVOvWlW6KmpTR3?5xW$b5E|9hAnAE5$$jM|cFFSwOA
zL@lr<R>qMSqx+vmArem_Kia+Dus+82a$mBcs0m+3t!yDGGwV?k?m(U9-B!PhIuln>
z<K^z{dDXEsCg23*VtL!p*NOuE=T2(^Dz&qabLK5Xo$i~cmHdnP!Ugql0T(vwpi<uz
z71%_K!xU_cdr$#A#u$w1>rCoP{`F~`Nkar~Mb*E=68HpLV0b^5k-k`$dKxMt-=G5e
z9(8E1qORFp(|gf9FM!HWanynuqRvFpi@w{#|Iwhx2U~{;sKYZ4wenR~-;CPx{iuPC
zqcV0GHSulKz>iR8C!oLk^oE#aQP1Pe<~{{oha}V?8e$JdV@~SRFl$Rtr+gu*e;R7S
z?HGoKFdWZY{Q;Jx9+>PhP#x8;E~;NUtbqPN3egl6U^)C4HPHoB25zEO@{iTM0sIM>
zdMLKUo~S_9pl(qnYK13J89I+z*l(x+{<7!!24-d4_li-_i_xeT8e?wkV)YkLdpp9~
zr=kL!g_`J1)EQWX>i0e>W81C%8EVT;VGcZp_3$Fr*ZnUt$VJ!@HBfiViTzN44a8hH
z9W}um)QVHh_fThNJ8GhXs0Ey|_HR*vUPHbAhqXV&tl$4b2D=YJVbry0gxaIgSOynh
zUfhZbXb)<_Z?P0!Lrs|dCD$)6YQjROFKZ-fE9;`Rpf%RS-smfpizsOCS79DJfF<#S
zwckQ*O~?@U0V-qGM;)>x)CA)&08>yITxjj7sBzy%Wo`>9u+N5&e|-|q(x4UniW=xY
zjKq+kF5()f0GgrtcSC&%hoQa`v#tIv>UQi#jdKPy(RI|y|3hWA;LGlL)tA|S4cL%|
zeApQkX&+Qd2V-p<f!dmNSQWp=`j~r|`)SzN9D+4yPc;u=W$F*GB1R5(TiP1cKGdgB
zg~Bqdga<GZe?`3zGQtH?7qw>%tv(7vs82*4&J+y91*k1}+v@44g>1z9n2Aw%0L!C)
zokBGV`9`{5v+H3b_3o$?PC{Lqc^HffQG2_}T!RW=Jt~74*amlF0n9bZ{c2YP)vpVN
zVo!`=es35Bt!y=Fug;+E=WUF`a-&_Ux}ttY%)nSoN3GxtYT$oR8F-2cIB<+xK!_QM
z%0Qgi1WW7wCs9zOqwK*<Br<O?DwPLOsXk%PFQ8I-2X&b4p{`-@Sa%q!U=a0|sKeM9
z)&FIT#4)JxQn57iduy%XAnH(@L9P4=>I}q=a|851UCX|xt(c0@I1fAHHq^v<$GgCb
zU=ivOsQ$IFAU4IK*aiK(6kevFYc$?mjN0SPSQNLJC(LW875s;~E%_$6EeJzpA{>>u
zc+~SosPS5(0%(ugsy-9Qe<+0^G$@d%s9TVNiu@zgKu1w~{1qzYXHk2653A!}s7#fg
z=zglTM~yocwel1U!=+dcKeYDi6Uo0$?R^>)z*AJDc_+CQhM)#0h1$a^sIwA>>em#t
zl2%slgbJ)1Dxeoo8JLC2%mQ;GF3!fE7kmmudC+^Z`<uyeSdRK8)OX=))QeBB7?zyk
zKDo8c?pTZVDX6pXk$E09arUY1cffquf_i(biK(W4l!8|F*cx(@5!K_(MAX3gn-blM
zVW>m4+T4h`R=ZFimZPYCcdWhSH21u!*#Px^J6HF;?i7^z!KjHxqdH8o`W$lsYEM(m
z_2wS)6e>ekFajT;`WK(>tcnUW5%p8`In4U||4|fl`hC<3E3g`7paQyx3g{=R-?jQf
zRR5ea+_f!=b*MK%9kPk2RA-tuu>tiGGu`uU7)6%6MHCeIHuEHE1vgNqJJ+jjqFPvp
zdP`JbJyC)6LtU%k);=9IUWz?WxAqLHZ@2pA=ohEsQG4(cDie3HFb2(X6P3Zr)GJ{H
z?2KC3E2vCu#>RLF>tgBI?!B(40DEJ39D-HxO;muN&gTBNr*M`AO;}-$vw@jp4nhSs
z74_nBYtKaO=~450dwvVmKYNOM9)Y@L)iDxVpfWo!h5Xl`u#^Vv*%zn}g*VrIXbPhS
zia`y~4m)ChR3IN?Zaj_pV0~xxU+wvysI3Wp&1I}KDkGh+B=+&GVG8Ony@txfN;4C6
zosMEOK0-}c=5_ahs)VY?n~7MNdJEJ<BQX}IT73)Z4DGeL{}lzD${(zu#5}%g)GMMU
z9Ew`$5)8*ps6daP-n)Q7SZuztJO)#bLv2kXYwv&w)O(@ce;Zkt?`@=@6<@+&ypLK@
zwgqm0Jg5MQnX#zb(FQf~VAK|kGZ&%yXV~+@<~OK-uAt`mBdgB-Kc%3R=6{19iC7n#
z;e6B!Ut>AEikdKBp$jm~EP(;Em$7<fGZwYdc&oQXovkD+jRP@4_kRwBC|rk{;0Wr)
zZ&8QtXAD8_P4_%MYQ-f{nTxmf_EztSdVeJ9n!ak!ccQNQAykGgqpwu{O+gtby2#zr
zL{uQjs0l`4D5jVzP^UKo_58TCUqJ=-Cn|FV7Q6Q%&6;Kl)cD;Ov;P`kfHh1u=UT_5
z<_G2{Sb+YgQGx%68tADRw8U*qaWfJ_c^-}GSKn-D?VXp9f2CreJ(z}ye7@CJnj6d=
zr~wb6`kl4*o93UGb$C-<X7XSn{UR_7dt*%;ZNBeQ(1+s!>eG1-3uEP_Zh}Ur$UB(5
z%$LmZsDNI@ytvHT)2%%N70`YxgGaC$-ZA~+%UlLpqB`_Jo%WgLdeoktG;g6!Z?3oa
z8e(}=fTOSl`l!r&fjU#)p$^>>tbxVecHfs)$UMF`kAgaEMGbTuwW4#V0q&soy3lgB
z!Z_558ld_&MLq9;ns_+sJs*|o_pvTsu;+zVxcAFq*3bXS6pGNHE*8c1s7ws7`dlnV
zJsk_;Zq#0$u=*9N-^UWP=Sg$_;h`LAoH3|zm!ZbljOuqp>i%D&ph&%y?w840s1+un
zR@lPooy;C)Uwb|Xm4UHVUt*@C#>v1K+>W|EH?R{v#H`={+pcn{>w=0f+3HhKTd}}Q
zx98hXD>#V?@D}RO{$=%`)$W5<9CauYPz!8s^@*tWX0B%c^HEqxgHoG@g)jrPC7)aS
z_oxBxpblB-cid040jPlALXEQ(_5NNA#II1}T*Qia9}}@;y8Bh_g>>H?zQr_@=D{Y6
z#gnLxPcaG;-*p4`#gf#=VsTuARd6FV!E>mTmssO6QU<lKcvO2E)XF=Wy?uKy#2ke>
zy%SL@OGmx1+dPa)={Kl7{Q+xZ{<ZFqHAhX@3-#V`)Hst-TbYW=<a*SW`4=fDvU{le
z`48&FO7FS$I;i?H7=dk20}e(FFvFg|Wxj_R?<0G@3w8QWqu#q|&%Je7{d_Ngf>IoU
ziYx}T!v5wka{}h3eFkdfb5ZwwH!6^0s1^Q*`oi5ujTiO4d)@{0-VjW{G%UvX^UhJo
zLBk)YfgYd^Q@-_X!lJ0N5n=U)s9&*~qXry-6*1lF$FME+f3ZHc{J_;`pfY(1d*B7k
z&-`AU4Q|CPFgNuMSO&XdBu+wQXa#D3y%>$hupZt+1z7b%_owG}sQNh6drMIZ+lk7|
zDb!Z{hrT)#-sn2kMeT8SR3H;DFZ$+ORLU1)5Uw$|peEdF^-Jb$^P!n@lY76Q8MTT0
z>%PX)Ae*Bm?2h`xzG(Fc7({)B`35S$G*rJe=1zNl(mankd^b`3pIUqF3|B9dLH;#x
zI1Mryb+2n#y*(;*Jy9zhi8^F&qB6A>HShscW{zPvp2xEI0Ch%+Z+3^V4Qhc?QS+tv
z6f{68=EpQ_iyN^c{*9Wj%@!9(FI2zLsP>tt_m^7xO4J0KP!sGx?e#%a|4XR;cTo%V
zA5u`qf?M5#2vohi8D}P9FzxNk9vDb{kU1K&R)#UOr<l7?@7=}_{2LWOz(-kU&i6tn
zs38WmvbttVRO-80{bkeyQ&9cqpaNZBu0XxN9t+}5RKH_b2fs4&WV&B)60>Cg`%}=s
zb5TFl7NZ8*jJh5BPy<~-P586<0F~P8+gxf(px&#F@z~Jn<FOp|IjC_qqUOoOO3d$_
zrVxt%pbk&ac4su|#U`i~4MYVn5jD_k)K9nh*1i@s&Q{a}2T=k3Xzl-)K_9#4rO{W1
z1PXewvpLY5gnB;T>g%vD^<7p!ZC*7Wpbk}@9d5ibW^Gj9tx$n?F<;oh{nr=lMH;H%
zO4Q*wj&<-qR0eA9bapeRnD3$jKa2|OJZj~4QP(qQms>y;vl*(rmpNH~Yo%}h3L3Q6
zt5IiRKPuwmsEE&5{jxp(#oGU}_Q$9I0(ZL!BT*C8!%El<!*K>`o|UNa_xThw;R)2?
z`3^PV4eRi$`N#~|<Noto7;1oCn20Z--rHd9TTv5#iskWVRHi~cahZ-n{S5J+qo9uC
zu^6UXeK+cbYp8)Aq9%M|^?Z9>Jrs4XOPkeE?>&QBX$RDMqfiU=Q4`Na#`V3e)?uf4
z$ov|W!pr6p45wb|Q#W8dD&@^l0ro^Kpr1W|#p)@j%%)>y+=@DD7qOgv{s-=J1J=M2
zJZNC`Zm1WMu_-P@4fG9a!fU7r?^t`z&)n$`!veHdM_t=QR7N^t1olT|WG0sKDJ)b0
zGt3jHiEg7(_6YSt&iyXHf~WwhnYB>Q6HpVivU*Q*khPCREhxq6nV9wa{}&WA;FqWs
zowfR1)LuO_OMmY6v?Xey!Kf{mj0#{8#^P$!0=`0h`>&uD@;hptf2{5u;QwZz2Z0CN
zgD}*<C9GZ@HE?aKH!)kI_OOH1r=kL%g~f4I=HTi-G>C{CKX~ZS$bQL@{ga0#k4f$y
zIbisx$i6g<9i2RCbY|lrTk;3TR*Q|R78e&8Td#ghoy;ebqO)a-&#W-{xA=(bTV`MT
nWcjr{3vSGvb|Y=>%_Zw^r0lr1bJO*dcW%ACHZyp8Qpo=SK2@Zp

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 34fae630..4ebaacc3 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "未安装"
 msgid "installed"
 msgstr "已安装"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "统计"
 
@@ -46,9 +46,9 @@ msgstr "重新连接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
@@ -160,7 +160,7 @@ msgstr "您确定要删除此域吗？"
 msgid "Do you really want to delete this user?"
 msgstr "您确定要删除此用户吗？"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
@@ -305,7 +305,7 @@ msgstr "数据库设置已更新"
 msgid "Database Configuration"
 msgstr "数据库配置"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
@@ -349,7 +349,7 @@ msgstr "编辑用户 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
@@ -384,7 +384,7 @@ msgstr "邮件服务器设置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
@@ -482,108 +482,112 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少执行权限"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "书籍格式已成功删除"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "'%(langname)s' 不是一种有效语言"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -596,174 +600,174 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此邮件已经通过Calibre-Web发送。"
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "发送 %(format)s 到Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s发送到Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "仅从数据库中删除书籍 %(id)s，数据库中的书籍路径无效： %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "将标题从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "从“%(src)s”重命名为“%(dest)s”失败，出错信息：%(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "无效的邮件地址格式"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr "封面文件内容无效"
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
@@ -772,7 +776,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -838,7 +842,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "登录"
 
@@ -1055,41 +1059,46 @@ msgstr "编辑书架"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr "抱歉，你没有创建公开书架的权限"
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "书籍已成功删除"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架：%(name)s"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
@@ -1170,14 +1179,14 @@ msgstr "分类：%(name)s"
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "搜索"
 
@@ -1197,102 +1206,102 @@ msgstr "文件格式列表"
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1369,7 +1378,7 @@ msgid "Upload"
 msgstr "上传书籍"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下载书籍"
@@ -1535,39 +1544,38 @@ msgstr "详情"
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1580,39 +1588,39 @@ msgid "In Library"
 msgstr "在书库"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "按图书日期排序，最新优先"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "按图书日期排序，最旧优先"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "按标题按字母顺序排序"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "按标题逆字母顺序排序"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新优先"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "按出版日期排序，最旧优先"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "减少"
 
@@ -2450,12 +2458,12 @@ msgid "Sort descending according to download count"
 msgstr "按下载数逆序排序"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母顺序排序"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母顺序排序"
 
@@ -2937,30 +2945,26 @@ msgstr "从："
 msgid "To:"
 msgstr "到："
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "删除此书架"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "编辑书架属性"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "手动排列书籍排列顺序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "禁止改变顺序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "允许改变顺序"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "书架将会从所有用户中删除"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "书架将被公开"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 9f2dd7d88e9ed3c4c7bdc7ea6e0295deccf4b713..79d132b691221f13e1f8cec1223fa0bdc8431252 100644
GIT binary patch
delta 11748
zcmYM(3w+4c|HtvK+ZZ<6Y;JQI#>|Y(T*h2mF1hA@$(>~St&}@IedQLi$co5iA%uxG
z_e;ee{Rmx@^hao<{!~hl>+kj6`8*!~9v(f<Ip1^noX<Jm@238KSa9XTg8s#@!f$*0
zbEcr@RmA;eRQvyb2E=<_S*imu5yxY7+<<lP1Zvz}48w@Ju3ihHsJFp-I1-ED66}Sm
zvA5^>-d_}&(9nrq$v6j#;K$e!k6=+OlHhrTFbEY;D8^tc7RPQFj03PFK9Auz3Dqyd
z+IOJ(9m=o!p7$jMEqD<%QJ(o5s^dK@g@J5e0hCAeuY?MuI%?-BsD52g^9({|CJn3M
z91Ow_Q2lpd1nYapDMaEWROAn^0tVK19ix#yUSs|hh@-8294e)+p#oim+VN^sMsu+l
z{)(M3F3IzH;AHHGC($27p?m|<kCQMCk6=~2g^Ij%L(kK-XoNcR&KQAHusklp0NjKn
za65+J0o2i*LS^b(RAzp~!uU@^&c8H;N7fM5$Yr7|DicW<g{@Ev4Mj~b6?LX_Pyug6
zPRaWo6<~?Rp4SwUktS~}>c}>s#&1LJtGBN)`H!XWGYt_~nj6>$W3ep0iaLsAR?kHR
z@;O$*YxcY_`BwibsQ!&nN75a2v_r85PD5pCEvnxppMp|-1Z&|>7>yx>-wqpMC{9E5
zTZrXxJ8HobI23=hdYcrtz(CY%Is&!hxmW=+F$}jNOL_jM6m)CvqZTN^jnUb~V>q@z
z4d{UiWF)r6NvKrsMWyy9)REmp-ST_L_3?@|ck?wz?zPti)o(g7zwc#G(110l9dAQj
zqPv)ig<H6@ZjZW*W3VD-q5|87tmPd>O{|ZGQXhm0xFTx4x~PpdMgDjl_*W3?d-Eyq
zCV20lF5~B@0hds>^ahr}TUZ5)wQ{Mfg_WtNq5>O+I@{T(@e9m%Pz$d^1(b_A>Z91*
zr|=tvr|=2#s+2E4oz;7&iT0xc`ONAkQ9C_{Me!QyyYMS&{9V*{A?OKrN6KIw>UB|<
z{TYnG+32fdHU;f`CziwGs2%@^x(oMEDKEi!D6m?n1yfO%urn&<&mw=kaaP}rn&%iQ
za~Dw=dxQ$4(v#%BDus4Wx*evW7I*=bs(Gk@-o@&ei@N>ap#u8@Be75$cZaH=HWH6|
zom-oIPywf-?#x8gTQR>4`By66ra=p?K`oGrn&=d2p)07!|3n2C*4FJf9yL)j)cAI&
z%iIq&?m5(vOhN^kfw~JH*z-L;1qE;%72#RbnP0XJH&Lm5Wc46kks{P9qf#G@4X_z1
z)h{70f;ZPZh6*5{z55vwiP~TnR3`jU6cqVX)Iu4k2v?v2+k%yF4{E1pQ9HbX8uvQ}
zV8N%{r3%D&>WP?ygHdOniM22XYvOsQ?-lCc7N~8uN2PiscE#DKv-}1-<Nu)oZPL-c
z3#grsK`s0ma!TF~tbzAYnX1~!ZKw$<@U~c6?|)wku{6xYVwjDEaVHkXeW;0#qR#X-
zCSnnyX^M@JpI_d~SOPbqjwly{a4#yr&romC4;X_F)Xw@|bQc$C3Mw^2Q47sQMY;@i
zhMQ5B=o9RL=TQ?SkR~nA7xnx_)Fpl0T#qT#KSgcmA?nDAJ<a(m;!+f}<47|K)v*Q!
zVghR7rdSGlV+f8!jh~3RbTd%_A3~1TJA<01ayQo=i#o~_490HV$iH5*AvEY#jze9x
zH?SmbL7m+mtAB~n)GwlLZ=vq)cg8YUlzLYT!ak^lpG5^c2DO3d<_grhyY>C$et4hL
z&<D$rS4BPsbyj;(6P!hTh<>uV*VENQus-dv$XC}JfVzCEP=V*6K5!2(5i9rNml=E-
z^+9{nrw~G62Wo+%sDVGA2He3`7~9)j&e0f3eJqCIY}66GgWCBTYu|>tgojZ_`yY(O
zQ>aYbMa|=fvu&lSChAfoB0qV(WYndZfXc*2r~pr+7QBvS@DGf@z`pJ%s-VucFDiiN
zupXwP)>(;KXCrcVeD6aFO3^+nix*Il{e`*%Mf<r4!%-7f$8e0r^4J1(XZoV<zy#C+
zuV5U`#w6U1%EVRF27bY!djD@zC`iKtRHTnlM^dl9+j%S04hLdw9E%CK3Zw8e@&nTQ
z9h+j(GwuWS0&2kw)W#O0GP4P_-X4tB`@i2BE~73*9%{m31NfPZ9We!`AotYUiP}-%
zKzCW2qf+}Ca;)BBER8>-Hu4blVGADQ0xoMNqp#HWqoBy9qHgniY>fv{0X;_TxcXpc
zPmHHN8!Kau)xW|>>fR7OuTT+{k>S`FSD`ZUEh?b@9YX$fYx8K(Yxaj(aH#7LhS9V~
zqIT2@btihF&TuFy@aOIM6x7{$1GV!kt8Yj3Ka85^Br0Q<hx%^e8#HL*2dK*vILuwL
z5VHpAc~i3;mZRPib?MTreLQN1Gcf;1P+!Q!sQ#-^8{LJv#K(LJ6)2pyhC8T~mmKag
zkbvsg1l6w#*2FZ7!9}PH?M5wh0hNKDQ5(5$^@1ZjuRZl}Y=;9;f%xxJC{JMrYKNy$
zDLRkZ+3%<T?%MO9XI;uGpvJ|b`lq56>|^yosH1(^+NYxed=0fuCUOUSFN=aYet=5Z
zE~_6xo!J*y2*1ZBcoB7}%8hgZ_CQ^xXRt7iKn0eDMQ|o+{&}b!FEuw{u-^Y&6tvJ$
z48Sk)AMnjbMS2Z2!Jim_1)g)?fnun)B?)yjBe5F3ikfd7Dv+(HOZpjB!n3G({=z`k
z_a0EtLII=PC$%){3~QrO-wczm8!CmfF&f{*Vz?74;>Xs09(5!I(%gq9!i-1F+Xjnb
zAM};7!S-MTYQhPae>qU!_=Tu1;Cj?f_M;{`fl+t?73d?>!lg&M{xPU8Uvt!Vp_kQP
zLcI<1Mw5R{w1x&Pl#80^1S+MMP|xq90tkBEWuQ7L(0Zs;CSyZviFI&1#^M_DbF4@G
zZ?opV+%KcO|3&_FW<CwIH2^j6Bu3#K>sT(`Ez}xy6z#44Z&XHRqAuHFEROG>QoPpc
zn^A%8L}m5>R>hM(g&Guo!+4B%!Tq|Nic!>uqcSiH^%g9_AY6_*x{YQwDu9o$1n$NT
z_&=yGVW}70uV_)IeuGiJKlsm5(6@aOYG)syj^YC9b-Rta<#orn3=Ktn^A}(uZboh3
z0&3zyFS!f^q5=-bP%LNG#!}RqIeo7ag%BDB*n@OTpgs+i!mSvLJMH-qR4Ttg-I4RC
z*Xj=Hl104i-ljy<C2N7|-v^^`5NbXjtLXiI!y2|?eI6XZTKGF^VEM7`^@>8JzB$HV
zN9>7Xu_S(m3iun$&mgM*Z4AYN<J{X2j)BzcV5HvvMk-);)S143dTqv<ubXR8k?%v@
z{^O{We~rq(IaC05?D=EVe8tAQ0D@4LvkHb`ZS)mMa|*ik?NE`wgqmnBYJo+lR4+lD
z>2_3xc3@4sh?=m-1h?aI7*4$=>JFt?`*_sloQYa@;RN!p2$#{IovpHt*{Ia-L*0!-
zsD59gcJQ6me?$dz9Tm_GRAwS3x{Opdn_*@F&+Ct6dH(Ap_umBrCX@eY8k$dbzbp<z
zrSc8b<=KL|?MG1Gi9Bq8MW?uhn&A`F+hALqi@F=9F$wRWHWD}0)$60`Bh7T5f(DF3
z-TD=%*W)DWQeCk6FQ^a3JygGn|91U4n*+^s)VOI@pN~rQa@4}>?D=M^`@601G3pGD
zn&-?L=3`Vw!lt>5#G(3kFbARnAA|ZHOh*N>9wRXa)&Df=Lw5xU$oE2CaUIK|B8;|r
z9BM!^*2a$52q$0@%tod7CsVIdGwNMY&ljLFb`%x(b+f>9w}A>+SMPrl3R-9smd2^5
zKo+8Qumtt~u0^%)zzE!rdj1uv{RgXGv-+P{p7wjz9{#G!L{-%I<`}^GUJnY|VSlWN
zvr#+Sf=bmTY>mM)+^^A3qZXWt3Sc2B<twlb9zyN-H|&DNX1WFYnCa$B^cBf63Ob_?
zQ3Fp{hdk7o-ZP8Oa?dNE`X`|R>56)-dSev6fOT;p*29C?5`RT~7wXP--;>nY<X;mF
zqCpc(!GX9K70B<X1p?=|4^s%L9)k+JF6wBWL}jcuDkJl;A}+OhF6xLsMU6XS{xXOB
z>vi&8bFX0{22kyX`XCLl`irO|nt)p1Jxs){R=<S0J2$OfV6OWv1f%+Q!&DrEF}Mb`
z!Q(!K3KV`sMfeDHi$mwRfnCgJP(MsYp^jvNwa>v6>Y1qVr%@Zag4${6`EFb+YGaL2
z<6EEt@Vii`OyN1yQOq&dpdvqLo<I%!4i(6CtN)GKQNZi&|LfJoC#lau_5Tm*`8m{l
z1s1qKf}Oq>L7^xQD%yi+GY++*`c`j)x;&k*3J%4p_^P=UOHx0A8uu0IPF+O>^3V**
za2u_J5&7>wg_3mWn%}@LBB%*oMqR4e_IwZOeLjlH)Fo8r9-wv@`G$K9Q&ID!p^jhz
zYQ6>LYSiWYNYC~DpSA~AQ4`-qMI64+4U9G$n;lRK3`8w3+UnEI4Ag?l&1~}%459sN
zRN#5&YobDn+=L;hOHv6nLA13uHlMWiZm7#M!rG@{DeCjBzTDhk=A!2N6xHvHnYW1i
zYr)$zXeakkABxa7-C1`-ee*}6j$$R2!7s5fUPq0KTI?ongxXMBvxhmvOvf;uPr*RU
zSWNykV5vP=hYDyHR>OlBkC)9-nQrIJQO|p0G)^{Gp^osd`2*^*-p5WD`IcL66t<;4
z-lw3H>_=Uq&rz4`HrB)7x7~-M1!|!gsOK9{fq#l&cnUTCGU}}eT;g^ZhuTm>RR3nE
zvwsS;u0M)`22R2x%tEF1jCClv)J;$kH9>VOg9%s`+o3Ws*y=M-cVjt*Vh)Dm5vzZ1
z^&3c_zE|KKUOhTgM@=*q%i<C&hg(r8J!bxh3iL4+$E0O0z!s<g+gQE3+0Pte&!0nO
zU|fEk^Ut&gS*TQHV*=)42wue=_&4g(bXe|E*AvT8A7S-rsH4a*vrvKOpaMIM5qRF}
ze_&PC_a0Nw#8uyQJBvfr2crh2VF{doO6d$Njc=ijVxzTxjLOWHsLNGkh5I4Z2^Huo
zsCky6#;rv^h{9e9<?%C&!z<VZgIBuOuP5sH>!{oOJ|^N3d;;&FE?v`AF0cVuk@^_a
zxD3?18&LhfMrFFpYR+FNskGYdED80X4Ql6|%zoBB(o9EP+Ht6ztw8nPVID$d@HFZu
z&tXF>p5^XVD^w=?X8CU5Xc{!pMAR8BLZxyoD!{X-z;0qayp38g`aRd4h^i-JWo(1_
zcLOzknmx}nvrzM8`_>^Bb?c9#241la_sxQ9T#5rxfyH6|9Wm3e6zyYC6VF8Le7?2s
zLj`gIwZY4%51W6RLL&;**18V;Py=7Y6wE>ebRG-gU#N-xL0zU&>)e8oScQ5ut3QFY
zsXv99ZyeUb_fhMe!j5|Xi@fjtdtNuB!CQbz<#*U0ucCI=YQ5X>)2JQx$7(nfqi_~h
z#rIL;kD>0!8Ek?NPysgD;Qq4P8}tAEKb?XGW}$X=2$h=eP&*IU=$=<GTcgf+I0oPh
z)KSbcGf@GrL<N#<?nMP~%<4Z$?w@zt8VY>i1_Yxfh&1C+?|X{b6$7acM}1n;tv&;_
z-~w|QD!}!qe%a<Bdwv%4fBxrD(B->@8W6b2O%#HvSF(DvnTUF?TUfm>Ds#`Gb~qJv
z$=*d}YAb4<lc<fI!3vnSiSw^c;V})mB-J;&+uaibsn132XfbMn)u@TrV@KSBJ+a6Z
z*WMo$NIGhvnbw|(8o%D2XQSpnyoLOiq;Qf3o%Q#q1^z@02*`Fj4MO#cLA5uqdWzZJ
z?1e!*A7+lh;?!R;=b;vU3$@`@z7<Ym5Dnf|_ZN>~)Iya|mowVxZBaYxY!1Zy9b0`S
zYJp7D_?4)@*O}W<;}6<%{}ctikKdRjKXkunq?)5p6J}r}F2z!qg9_|0YN4yBg>IPt
zpaKin<}z9lOHr?f$=K4>eQy$lXd33CCdx)Fl#8+W1?oudp)O6(c4sZrH#`-!a4*#O
zVW^*OY1Td+H9iA1Zx-sP_vg2B{@+-K>(=4EbtwCh8<=3Gn!QmIq*;9iYNu~oeY1Jc
z{1WxH<XQcZ8Ja`jdjF#-DDp%z8TG|#i3vCvm7z`MY4f&OKGy}%0=2`QsMl@`D$s>i
z-)J5~t#=Lm7z#Hj=!_$FxKvg_b*N+YB-Ha(*51L|yI}<FgHQ{NLoJ+vI=U^WBl{M0
zS8kz>s`O4bU(`<Ce_e{&G-$!5s1B{oF6J}Xp7v2z-;OP*A4H9NWbH+ExrM{92JOu-
z42NMnjz?{HEh@khyU4#H|H~SJce??}sEIqG0_tw{!B!uM!L*MxXP_2()1I$GWo$dv
z#(k*yuG#aO<~`pEMfbSWg_}vJ)OAM%kd6^J1vSwkEQd?&`8KN`KxOn>)Q+#A?oRk#
zH%}AP9cgQIe;5UId=XP|C2E4psD*B!7P@Qgq5Irzu8JYFr(h^{LS<kO>JGew3Vab(
z!j<Me^Bl5{@7<xGR2ALt283cH^~$IKnwqWcd3)4Cy{taU9B=J2P$_@g>Yt$I{~9&l
z1=NP}^6Q-cLkhYSg%7w}S_id27gWlJqINP76LA(QLpxEQ?4zg!&Y%{!X!Wb+Z`S?~
zYF_W4>sJ~}HlSX?8e+`4s3U1;_2H<9M`L-MnUfZOD<$WZwC96^>c=M}#wRq2N^H<H
ZAt~qYi7^EVG|8zvd2n*hn(aM<{tKEoOsN0>

delta 11812
zcmYM(2Y85A`^WLe4w6VhBr$^^Mg*}EwL<M#vsJUyirO?<9xZB>7ZIzWHCme*wTfCr
zDQ!^{t)~Cid{xnwS6jT_U(S79|6aZNIp;iQ+~+>$c@nzpY4%4?v->}V<xKbZ=lkrQ
zR}7C9R_*`)Ns05k2&zM|8cxMBxC<-e71X$ZDxMdHWl{Ay7>%7V9>-z;euABG3wH55
z-^<0*L>gYjI=B#X;WyX-zsEcnUe)t*U~yDHrLa6EVm|DH!I*-9_!btz>8O6oto=(=
zzq46&-}5plXu*4^iT*I3qdMke+XXNR6+i`4|2R}238<a7LiOv3n&%BvCQ`99F2o?*
zgX(`A!&%?EOra>=M@1f3-SdiI6sltl<X^8D|H+HvF$|}mQo0Bg=trm>Z$V}BD87Kt
zunpEt@Vt&V16$#b==Y>hp@!$R#_3oIzsFLTt)`2-4C-1mMV)yM49A%mg&$#V+>80~
z5QgAs)Y1Kf%G3>1W}abA%v+1|FGwM{mTM@D%0zioCK_Wjwnr^A0yV)b)R`_s1$+QG
zE$<F0z@oK1FA19?P2ObGk?lo|KZx90?^JE_UxC6C8p5#*H?S)vVg$}Z9mP7UA4LUn
z6^r8|dtQiqtA9MIe>2pP^hIrG1eV3ws7!4~_1o)HP^!PjSbU5z7)|)i@I?&8*{FUW
zViX=iEqDd{;O|!NT-Ply6!n^pM(ubp7Qs~*h6j+PJpVfiy0!VaDO#W?>g?*FE>m07
zfY(rgjKxMc9hK^nsMJ129obXVEzehvi;Iz{`Pv}&+v|zyHy4@T_m)x6fNiK9A4FZE
zfcl(27DAnMH`Hr135($>RA2{@HNA7Fi9`5kDD}lr0ar%NS0A;}mdL-}EBq&j^}VGO
zcoV#}sLOa2HQ+w#mi~i<F<V2=D~XY)RMx=~*bx=jNYvS;qsC{LYf%gDKm~LZb<`K|
zC7;4`3N7#@@~V_)pcdGQn&@j(AeXHEBWkC&F%LdMeHWgg#s?(3??Q3Z9Vv&Eu|Ddu
z4?$%#9esU3_EXT#k6|QUM(y}_)Y;|Z9F+2+n6-1%f*nx{^gyM24Dzox#p)+e^ISw_
z?j9;*!A)EsaZSj7DH^)cpdF^77MO@i)e=-d8?X!>Mcw{esKBzn=w7das5=yo+DJXr
z>)gQ{fC_j5>ds6<y%kGeB>zg~$24fcZKwr~q9*zYwa`OU<T;wU0868GTn{x-Yt;Cz
zs6Ymx#*ITA$#g7=%TRY=k3Ij&r=S2XqawVCI`aqC;VEjNU|tPPSR8X<6;$eLU=3`I
zO7%Nf9~YY!Q2`Wg?tX?;LT#`oDii*j6cqU^)I!Tp5pF~UwhxQrSE!xdMD6e)YMgFv
zZV1Ej7=>}z2orD^>g-oxEFQsfc-P7IzolCs$?S$o^;m3&>8P{3j&1O7RG=+d*>?f8
z^GT?M7a^zReTii;e`}YiYN!phKn30fE9(6pNTC7^X&8X}F()3we0T~q@deZo<Rpq}
z7>-HU4EcfPy^HyAH|mIvVi2B01$YVd7X60GRA5`$S>LNcL6NpXrDg<bp~a|3*P+hv
zbJQjJ7CYiy)I<$QlNK0=dhVm%q7TfS$XDL`4z;16_U_0c(O1MJDQL%)%&Mr4H8C$X
zL`~ch3*hS*f@4wRr=c!g8Y<wk$nkprM$J>DgKJMj9c3#F#y%a$zh1N9H0V}NL0z`x
z7>N5&xBM%sXJQQXd#Kx6@Fn*<V>!%2y%#Fw15gW(K?OVswSl?jM%20|^!??YcvorY
zim~KXkxxRM)k)L@H&Gv=$5s#N<m%B_o%TfJ>+7YUF5hNU;D4Y#aDkoOovDHisrN>G
z&{p^qLMVKRTHpd|;BQzB^K@|o5>c0PJci<A48wHP5v@h-e4Di&L|wvjsH6P>E8tJ4
zOa!o7&Ev;VP^xO7-s48dPhhV(>e9T2%EVz*fY(q9{uc{l_HOP>qp%M3c+}YrL<KMo
z<8cCNolU59b|ZJk_r9Q@6rI8d{1p{hu9w{%h(JvkgPJe_3t=KgVO!Ll8Hl<A@1Yi$
zgOxBH6Yvl!6Mv#M@E7LM`=9d_c0ofRD$)X|BWZxzd3y}Up;!?oV^!RY(RdB{LFswj
z-S?m|>H{_rwcs+;##W*>vKO`9R~V!B|7&Y_fVvcapeBrbl~)J5V_lqy+*9uuYDZB$
z++}TpO6?-#c)gWa5TBqn64cY(oe~&Ly}a2ReWiX71w}Rsb(@!BBRq`?s6a2b;{>xG
z#?hXRCGd#Vf5D>ELwfUP1+0uoI0|dyW>iLQpf2-&dXs<M+CON}YnHu_GYr+CG{#^h
z)Q;Mtz6<?OXE*{C_*?dTChG1iNA3Jms~<x3KZly<M^wfh^zq$-|Ina`1N*wm6NS2D
z(PmB5^Oj~;jHKQVb?GKp`&85p=VR89puUhRQT;cgHhLU2|3#ld5ej#$A<t_r<;74L
zXo%|A0@bf4mcvxkxBnwlhEAXs`W2OdC#bg|e?M0b!{*duuo(_T1>%23A&SD6s2yHI
zrRXkdXI_67Kmh7_aa77HqQ)hn`gcSvIKb*}ppN!kYoCh>a1m;rRmcW??^6ouxCfQ8
z<5oY5I<ucK2j0O%yob6}v9G%TUqfYT2<F7msK8P&7p9@+UxM248gmy0>-|4YK?_~L
z-1u|W1HSpFNFSjl$T7e@55<bqBT;WlW7N@%#nLzrHQx?YAO}zxyM)E@CTg8r1L?>5
zULXZ6R2cP1ErUA4B-Gir#sutxN?|(2;0g@DV^|EovG%*DBMBYkK0Ia3dRT_`&ZzlQ
z(a%F+76qj)%^oa9O}rkJvhAqAj-bATmr*;qkDBN?Mq}t;7jSh{0L@VSyQ98<BT(Om
z8CL&zF!|SOv7ZJ_bOE){E!57Rqf%RFh<hH7ny?Wn6J1e(zJ^L^3f9C?SQ*!01-xK-
zDee<r(R?L^{KwK^CJj2f?O0I*Py@3Kbvvts>em{z&=}N_ylwSQQ5o5Vx^%}dAAXI>
z@I|X%Lyf<K%IpK5LMaN_-f+JImccmcEwChx!)RQD%Fu4q+i((t@C@qcu9}&s0B&G@
zyo)XIzo;)_<6-VswN9vhei{Y+BC!Ok;zrcYencHb=y3Pi#iDL|UsQ(DQQ!W9SPidX
zSqvTFCa#UjKs{8z%`p^Pn?13B-v8mQ;7!61I?T2D3am<fD=LM*U@+dX=TA_n%sbNE
zkr34DRS9*;T3{gdN8PcJsQ$As8s}ry`@fxnQhhk9frYR-^#`akj~V3#wn4pSolvPC
zf#uQ1PPhiO;6JE<^NzL*qWZ^TDAq!~4b3s@{qIdd5f3)sL!IeLRL3>u7v@D&CVoTR
z{%5GO%rnMiAP5yeCDii-)O;_X0%(LfnvUp)QRqn_FOERn`nOPL|1oN!eW(SFqF%?7
zs58Be%Ft~rhhbygT}njlxHT5SS5TksVb;D5bvbv9<@~kq5gHWXY1GcnTE|S(nf->k
z8;?-^@{Dsk2t?H*PyrP~1r&|ic?;B?c*z`&Y1#PQ5F=<Woyz-Pi$YSW`=pM*O4Jvk
z1|CLTo}W>-{R!$j5jo!dvAZs6q2ZW}sn`_vq3%YGx7^!Q3AK@4R)5{<OMNS>Kn+-n
zy7k{8uZNfIZFi|cQS}n2??n|<zxLMtjyca<fx3)at$qNN=`*N6F4=Scnl;=te@ESk
zzs#Tst{!bBpfb`Fm62Z7KGB?q3UoE<d$0o)$Ym^wH&OHFn3(mU^S#0p6j2jY$5vMF
zX7ygE0V${tkB>UC^_Ym6n1Dq&O4$xyz{#lR2T>XO3l(^=NzR&Bg8S#SrBH<jLs1K5
zU_so13hW3fu#>3Q=OU{8HiqMU)brf$xb}jmdJ(Ia$0+Jmti3rZ6P+>Z@Bc?o(1g=a
zJDh{%a1UxnKVuvgde{A0o{Y7rPeF~_hg$FmD&^l|WqgF%ahb_%5???CJj+~xz8ZE}
z!)a7x|A!j*+}b0jxHGL{)<->Wi|RiB706`NYc&(2aV09VM=%~AVgoEa)qNNGP9^_E
zXc$L>CYq0$U^Di>W2l8<-g67o!@|^?SiL)H1AS3P^Cl`|Gf^2ifW`2X)o-DW_)pZh
zfN7k+3MHnw*Qo~THSCYMaW)3y0;{h=9npH!0^egb{Ke{prn|dS3iZ4uCS$VIr($F3
z^RYZ$@F{4A&rq3&nBgL<j=IG!q9%IR{1@uent^)F)?52ttV{hkX1!iB-G&OIHrNa`
zt_NykLr~-WkrWibyI2B0Kpn+i^8zY>hvswCz`$8<!eXd;MbwUxurv0>Cb-+4KegvU
z?^|Y&KzuLR6}%RhhXL)a-p%ZV+R^J)PeuJunS>=V9ZTV7=0yyo{sc8H_iT5kqELZW
zGaF%1z5g93C`Ch211DR3E^2~LP?u_tJ^vN;KL3TvRG~R8b5&6pXoqES9BRI0sQK5U
z<~wMf!(y!O-LMWh{^dGEp(d`3inzJ8cQc2W6HyDyLoKk}>O0Iss0GiMndTp;pQd@{
z@?%|R9+{R|yr8dZ(Sarn>4utmi20_qPet99#n!$R3s65`^)u!b^A>8pKT-Vx<~bu#
z>&2o%kDtd$G@$Sz4LaSasIUA|RPw(=z4^K3yKi4H)WA-ti3g(s9&b)F7nmzBjOUv%
zFCMb?Q`UZIJ}04w{zF4)e28%vp5|<f+W837^O+cfo6NJQLwjr%T;Q%}JhrC29V);K
zY>Mkpf!{~n8qZI6*D4m{sVAd86(dm#?X>4tP!s)$VVHfPn;;zZ9@Inauor4WgHZj4
zqYirlYT*pj!W%IG{qq#`V<ljb>(CH2L3`8$U9m9s!w7r}m5DT~??h$j42I%OEQC+2
z9=zDqqfvp@#CF&fnaB6mP>7)6Bu3&dsFeO~Ml5lWCSX3=2cQBRi3%{)>hGDe%?0-S
z15^gqTK%|r9&_tUkV&B`9d2O=MlE%J(Owai(ut_lO-BW|*y>wRM{&qJj|%)IDzF?M
zxXT)Xs+U7$AOSURXH3wSpqDkIp*k+Z{J0*K(w$fkPoR$Cs<r=)I>THU?s6q!HR_X4
zfo?<1a|$)?A_n0-jKY7=uSB8nGWYk_$ykf}bX12guq6I~n)nGOW2NP8CvTtvn~TM8
zHEP@;)Vx<v{qub2j;tkyQ}2M<*nkhozs@q12JL*3IUCi!)LenOwQEs3`xe#zw)qH^
z(i|VTqYT2D)a#?})@am%@1w>oN6oY0Bj26jQ5uxWi>L_muW$jBLcNx;sDa(Ay}#8{
zumtU?m~}T$<G0%L<K}tPhBEE>EmUC7d<q&^c%|zQZ`Q(6wAVug)(f@6G;<m1Qm#Qw
zybE=S4_Nzes6d{hE@}8G_d$zA9dQ@bbAL7k4P1qF@jNP^kkzCUE1){Yp)ONn)Pn7>
zBzCd-Sgc5W0&2ds7>hrk7R>&!`+qKpm_&W5tNY$T3QBF@C;X8Sqfk2=joR@P%#Cxf
zG^S%T?nY(k2h{k#QFkO@jr$WoRaAh3u>#Jt`VQ2%^BB(k^Bz&qH$QN#+j$bILq~HA
z>Wmj*Zrq6qY`=LN74UbcKr+pHr~v-9deL?6d8}Devc8v0K@+qyd!b&dVdiAaOMMaQ
z)4IayJ5dWBG*6=fyo~CXX+E;&`PaMtk*Ld87PEf-*RuyrP!n{pdN;E_>b)Lm_4iSC
zVhL)8TTqwm8&sx#LCuqGgWFgD7NH)AWiSDCN4jnx|GM4NX~>KFP&+z?n&2F2;>*|y
zf5lFixY4!GK?Sk`mBC%sejKwhVb3#B^FPKw%(lrLb?_$guLa7}paDs!oi;*s>~8G?
ztv<|r+nj+x^jm1I#(dPbnfp--pFr*SteIo88&|`p5X^&QQ~(`Nm#>@E$D?-kjyVsr
zc5L-ss0EIr#(#$j{E~ScHU6PJ&%VXIj(JVLA%z$^j59M(6CT2%cnS;PO;liyQ42+V
z>K2MN<4}Pmp)%SYHSRU6gQKjz5w+evWFFtkq@aavVFk>&)lE<Zb!i%zuVPl97)pBv
zYNwk~0ez18DR<b~e?SFt12z8>)Q2s6o6Vmk=ii8eI&?yH7;YVAm>K34dw$sJS5P~?
zXZ4)h-NX@QMburYXZ5b;U{v4}Ft^_SnJVBsOvJ@l70;q}oMVSG)@);rL<O)2wSi5j
z*Y7LTMs8U>+h?vl8nsRXERRjm*IB<oK@q)a9j03Sebn<M*1pQx*JC*CyHE?AMlE~;
zb%eQgx}%Fn-I<oC`BPByrK0Y}<ei+qB1*FkOU*Ur4s6czLsrkX%l%bC1ZrGY)Wkhe
z3lG7vn2uriImY1`)Q<l_^^4i<0&lyU{HtLA4H_^HHSucH#2c)>+v;CnFzsKPS5V{b
z*z>2T9p>BPei|0StdyhXYif2hd;1iWx}oO#s9V3mIvhi#`W$Ma+Zc)W?Rnn4u3i|G
z(s<O48=&saP}IWnQFr7+tACE_=bxa^n8G8}1WBK}g<7H(>VRq=j8QlqLvR6x;>V~A
z>_TniBx=FiSR5ajh4#66b<}+AkxcnsZweYP7>nXK)K1gPrS^OUYN5?mKV+V<_A6MC
z=l850wci~@Wz>ANP#dae^)6VR^}QYxbW5kA7FdHy`Ce3D-(ofV5fyoX1Mb^h5_Q&b
zs0C_Uy}sGp+FwG=`?A$jQ1gyby)uPK_Fx+7Oy*d9A1dM_sMKHG{&L)dx+S8=4N6Ig
z?%O}QU;mW;qx<)Zetp=;=sq-!8P$K}sO?P#jR+2^7FVr$T=nYF)e@7c*4ln}T={I-
z>TJLBX0JLWu75i1M#kjp2bSNMG3iFejGGJA-k84g-@7+mpT7R~lGWRjw{{QuAM)jI
AwEzGB

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index d9cbf08b..d64da8b8 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
@@ -16,7 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -26,7 +26,7 @@ msgstr "未安裝"
 msgid "installed"
 msgstr "已安裝"
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr "統計"
 
@@ -46,9 +46,9 @@ msgstr "重新連接成功"
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
@@ -160,7 +160,7 @@ msgstr "您確定要刪除此網域嗎？"
 msgid "Do you really want to delete this user?"
 msgstr "您確定要刪除此用戶嗎？"
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您確定要刪除此書架嗎？"
 
@@ -277,7 +277,7 @@ msgstr "LDAP CA證書、證書或密鑰位置無效，請輸入正確的路徑"
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr "設置數據庫不可寫入"
 
@@ -306,7 +306,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Database Configuration"
 msgstr "數據庫配置"
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr "請填寫所有欄位！"
 
@@ -350,7 +350,7 @@ msgstr "編輯用戶 %(nick)s"
 msgid "User '%(nick)s' updated"
 msgstr "用戶“%(nick)s”已更新"
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr "發生一個未知錯誤，請稍後再試。"
 
@@ -385,7 +385,7 @@ msgstr "郵件服務器設置已更新"
 msgid "Password for user %(user)s reset"
 msgstr "用戶 %(user)s 的密碼已重置"
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr "請先配置SMTP郵箱設置..."
 
@@ -484,108 +484,112 @@ msgstr "未配置"
 msgid "Execution permissions missing"
 msgstr "缺少執行權限"
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定義列號：%(column)d在Calibre數據庫中不存在"
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr "書籍格式已成功刪除"
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr "書籍已成功刪除"
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！選擇書名無法打開。文件不存在或者文件不可訪問"
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr "編輯元數據"
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr "%(seriesindex)s 不是一個有效的數值，忽略"
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, fuzzy, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr "%(langname)s 不是一種有效語言"
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上傳文件附檔名為“%(ext)s”的文件到此服務器"
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr "要上傳的文件必須具有附檔名"
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "創建路徑 %(path)s 失敗(權限拒絕)。"
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失敗。"
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "數據庫錯誤：%(error)s。"
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "標識符不區分大小寫，覆蓋舊標識符"
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr "已成功更新元數據"
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr "編輯書籍出錯，請檢查日誌文件以獲取詳細信息"
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上傳的書籍可能已經存在，建議修改後重新上傳： "
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 無法保存到臨時目錄"
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移動封面文件失敗 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上傳"
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr "轉換的來源或目的格式不存在"
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "書籍已經被成功加入到 %(book_format)s 格式轉換隊列"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "轉換此書籍時出現錯誤： %(res)s"
@@ -598,174 +602,174 @@ msgstr "Google Drive 設置未完成，請嘗試停用並再次激活Google雲
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回調網域名稱尚未被驗證，請在google開發者控制台按步驟驗證網域名稱"
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id為 %(book)d 的書籍的 %(format)s 格式"
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "發送到Kindle"
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此郵件已經通過Calibre-Web發送。"
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web測試郵件"
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr "測試郵件"
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr "開啟Calibre-Web之旅"
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用戶註冊電子郵件：%(name)s"
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "轉換 %(orig)s 到 %(format)s 並發送到Kindle"
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "發送 %(format)s 到Kindle"
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s發送到Kindle"
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "無法讀取請求的文件。可能有錯誤的權限設置？"
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "刪除書的文件夾%(id)s失敗，路徑有子文件夾：%(path)s"
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "刪除書籍 %(id)s失敗：%(message)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "僅從數據庫中刪除書籍 %(id)s，數據庫中的書籍路徑無效： %(path)s"
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "將標題從“%(src)s”改為“%(dest)s”時失敗，錯誤錯信息：%(error)s"
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "從“%(src)s”重命名為“%(dest)s”失敗，錯誤信息：%(error)s"
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到書籍路徑 %(path)s"
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此郵箱的賬號已經存在。"
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr "此用戶名已被使用"
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr "無效的郵件地址格式"
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr "下載封面時出錯"
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr "封面格式出錯"
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr "創建封面路徑失敗"
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的圖片文件，或者無法儲存"
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp格式文件"
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "僅將jpg、jpeg文件作為封面文件"
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar執行文件"
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr "執行UnRar時出錯"
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr "失敗"
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr "已開始"
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr "未知狀態"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "請不要使用localhost訪問Calibre-Web，以便Kobo設備能獲取有效的api_endpoint"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr "Kobo 設置"
 
@@ -774,7 +778,7 @@ msgstr "Kobo 設置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 註冊"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”身份登入"
@@ -840,7 +844,7 @@ msgid "{} Stars"
 msgstr "{} 星"
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr "登入"
 
@@ -1057,41 +1061,46 @@ msgstr "編輯書架"
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架 %(title)s 已創建"
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 已修改"
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr "發生錯誤"
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共書架：%(title)s已經存在已經存在。"
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有書架：%(title)s已經存在。"
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+#, fuzzy
+msgid "Shelf successfully deleted"
+msgstr "書籍已成功刪除"
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改書架 %(name)s 順序"
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架：%(name)s"
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打開書架出錯。書架不存在或不可訪問"
 
@@ -1172,14 +1181,14 @@ msgstr "分類：%(name)s"
 msgid "Language: %(name)s"
 msgstr "語言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr "搜尋"
 
@@ -1199,102 +1208,102 @@ msgstr "文件格式列表"
 msgid "Tasks"
 msgstr "任務列表"
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr "出版時間晚於 "
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr "出版時間早於 "
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評分 <= %(rating)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評分 >= %(rating)s"
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "閱讀狀態 = %(status)s"
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜詢自定義欄位時出錯，請重啟 Calibre-Web"
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！發送這本書籍的時候出現錯誤：%(res)s"
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "請先設置您的kindle郵箱。"
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "郵件服務未配置，請聯繫網站管理員！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr "註冊"
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr "您的電子郵件不允許註冊"
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認郵件已經發送到您的郵箱。"
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr "無法激活LDAP認證"
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "備援登入“%(nickname)s”：無法訪問LDAP伺服器，或用戶未知"
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "無法登入：%(message)s"
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr "用戶名或密碼錯誤"
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr "新密碼已發送到您的郵箱"
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr "請輸入有效的用戶名進行密碼重置"
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您現在已以“%(nickname)s”登入"
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用戶配置"
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr "資料已更新"
 
@@ -1371,7 +1380,7 @@ msgid "Upload"
 msgstr "上傳書籍"
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr "下載書籍"
@@ -1537,39 +1546,38 @@ msgstr "詳情"
 msgid "Current version"
 msgstr "當前版本"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr "檢查更新"
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr "執行更新"
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr "您確定要重啟嗎？"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "確定"
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr "您確定要關閉嗎？"
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，請不要刷新頁面"
 
@@ -1582,39 +1590,39 @@ msgid "In Library"
 msgstr "在書庫"
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "按圖書日期排序，最新優先"
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "按圖書日期排序，最舊優先"
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "按標題按字母順序排序"
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "按標題逆字母順序排序"
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新優先"
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "按出版日期排序，最舊優先"
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "減少"
 
@@ -2457,12 +2465,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母順序排序"
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母順序排序"
 
@@ -2944,30 +2952,26 @@ msgstr "從："
 msgid "To:"
 msgstr "到："
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr "刪除此書架"
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr "編輯書架屬性"
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr "手動排列書籍排列順序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr "禁止改變順序"
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr "允許改變順序"
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr "書架將會從所有用戶中刪除"
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr "書架將被公開"
diff --git a/messages.pot b/messages.pot
index 15027461..d60872df 100644
--- a/messages.pot
+++ b/messages.pot
@@ -1,21 +1,21 @@
 # Translations template for PROJECT.
-# Copyright (C) 2021 ORGANIZATION
+# Copyright (C) 2022 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2021.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-22 19:06+0100\n"
+"POT-Creation-Date: 2022-01-06 14:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
 msgid "not installed"
@@ -25,7 +25,7 @@ msgstr ""
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:138
+#: cps/about.py:145
 msgid "Statistics"
 msgstr ""
 
@@ -45,9 +45,9 @@ msgstr ""
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
-#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
-#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
+#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
+#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
 #: cps/uploader.py:103
 msgid "Unknown"
 msgstr ""
@@ -159,7 +159,7 @@ msgstr ""
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578 cps/templates/shelf.html:91
+#: cps/admin.py:578
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
@@ -276,7 +276,7 @@ msgstr ""
 
 #: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
 #: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
 msgid "Settings DB is not Writeable"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1370 cps/web.py:1478
+#: cps/admin.py:1370 cps/web.py:1479
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -348,7 +348,7 @@ msgstr ""
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1643 cps/web.py:1443
+#: cps/admin.py:1643 cps/web.py:1444
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
@@ -481,108 +481,112 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/editbooks.py:305 cps/editbooks.py:307
+#: cps/editbooks.py:300 cps/editbooks.py:302
 msgid "Book Format Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:314 cps/editbooks.py:316
+#: cps/editbooks.py:309 cps/editbooks.py:311
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
-#: cps/web.py:1743 cps/web.py:1810
+#: cps/editbooks.py:361
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
+#: cps/web.py:1744 cps/web.py:1811
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:406
+#: cps/editbooks.py:410
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:454
+#: cps/editbooks.py:458
 #, python-format
 msgid "%(seriesindex)s is not a valid number, skipping"
 msgstr ""
 
-#: cps/editbooks.py:490 cps/editbooks.py:954
+#: cps/editbooks.py:494 cps/editbooks.py:958
 #, python-format
 msgid "'%(langname)s' is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:630 cps/editbooks.py:981
+#: cps/editbooks.py:634 cps/editbooks.py:985
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:634 cps/editbooks.py:985
+#: cps/editbooks.py:638 cps/editbooks.py:989
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:646
+#: cps/editbooks.py:650
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:651
+#: cps/editbooks.py:655
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:674
+#: cps/editbooks.py:678
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:810
+#: cps/editbooks.py:814
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:844
+#: cps/editbooks.py:848
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:857
+#: cps/editbooks.py:861
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:895
+#: cps/editbooks.py:899
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:993
+#: cps/editbooks.py:997
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1012
+#: cps/editbooks.py:1016
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1059
+#: cps/editbooks.py:1063
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1084
+#: cps/editbooks.py:1088
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1092
+#: cps/editbooks.py:1096
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1100
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -595,174 +599,174 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:80
+#: cps/helper.py:77
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:86 cps/tasks/convert.py:73
+#: cps/helper.py:83 cps/tasks/convert.py:73
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:91
+#: cps/helper.py:88
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:112
+#: cps/helper.py:109
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:113
+#: cps/helper.py:110
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:130
+#: cps/helper.py:127
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:135
+#: cps/helper.py:132
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:146 cps/helper.py:152
+#: cps/helper.py:143 cps/helper.py:149
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:219 cps/tasks/convert.py:90
+#: cps/helper.py:216 cps/tasks/convert.py:90
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr ""
 
-#: cps/helper.py:224
+#: cps/helper.py:221
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:316
+#: cps/helper.py:313
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:322
+#: cps/helper.py:319
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:330
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:388
+#: cps/helper.py:385
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:403
+#: cps/helper.py:400
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:467
+#: cps/helper.py:464
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1658
+#: cps/helper.py:504 cps/web.py:1659
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:515
+#: cps/helper.py:512
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:525
+#: cps/helper.py:522
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:598
+#: cps/helper.py:595
 msgid "Error Downloading Cover"
 msgstr ""
 
-#: cps/helper.py:601
+#: cps/helper.py:598
 msgid "Cover Format Error"
 msgstr ""
 
-#: cps/helper.py:611
+#: cps/helper.py:608
 msgid "Failed to create path for cover"
 msgstr ""
 
-#: cps/helper.py:627
+#: cps/helper.py:624
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr ""
 
-#: cps/helper.py:638
+#: cps/helper.py:635
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:651
+#: cps/helper.py:648
 msgid "Invalid cover file content"
 msgstr ""
 
-#: cps/helper.py:655
+#: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr ""
 
-#: cps/helper.py:707
+#: cps/helper.py:704
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:718
+#: cps/helper.py:715
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:766
+#: cps/helper.py:763
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:768
+#: cps/helper.py:765
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:770
+#: cps/helper.py:767
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:772
+#: cps/helper.py:769
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:774
+#: cps/helper.py:771
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:127
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
 msgid "Kobo Setup"
 msgstr ""
 
@@ -771,7 +775,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -837,7 +841,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
 msgid "Login"
 msgstr ""
 
@@ -1054,41 +1058,45 @@ msgstr ""
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:261
+#: cps/shelf.py:262
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:264
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:278
+#: cps/shelf.py:279
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:300
+#: cps/shelf.py:301
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:311
+#: cps/shelf.py:312
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:380
+#: cps/shelf.py:333
+msgid "Shelf successfully deleted"
+msgstr ""
+
+#: cps/shelf.py:382
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:450
+#: cps/shelf.py:452
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:454
+#: cps/shelf.py:456
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
@@ -1169,14 +1177,14 @@ msgstr ""
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1076
+#: cps/web.py:750 cps/web.py:1077
 msgid "Search"
 msgstr ""
 
@@ -1196,102 +1204,102 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1214
+#: cps/web.py:1215
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1221
+#: cps/web.py:1222
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1243
+#: cps/web.py:1244
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1245
+#: cps/web.py:1246
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1247
+#: cps/web.py:1248
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1352
+#: cps/web.py:1353
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1448
+#: cps/web.py:1449
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1452
+#: cps/web.py:1453
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1454
+#: cps/web.py:1455
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1471
+#: cps/web.py:1472
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
-#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
-#: cps/web.py:1514
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
+#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
+#: cps/web.py:1515
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1506
+#: cps/web.py:1507
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1509
+#: cps/web.py:1510
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1524
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1542
+#: cps/web.py:1543
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1549
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1552 cps/web.py:1577
+#: cps/web.py:1553 cps/web.py:1578
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1560
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1566
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1572
+#: cps/web.py:1573
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1638 cps/web.py:1687
+#: cps/web.py:1639 cps/web.py:1688
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1654
+#: cps/web.py:1655
 msgid "Profile updated"
 msgstr ""
 
@@ -1368,7 +1376,7 @@ msgid "Upload"
 msgstr ""
 
 #: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/detail.html:27 cps/templates/shelf.html:7
 #: cps/templates/user_table.html:146
 msgid "Download"
 msgstr ""
@@ -1534,39 +1542,38 @@ msgstr ""
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:194
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:196
+#: cps/templates/admin.html:195
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:209
+#: cps/templates/admin.html:208
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/admin.html:248 cps/templates/config_db.html:70
-#: cps/templates/shelf.html:96
+#: cps/templates/admin.html:213 cps/templates/admin.html:227
+#: cps/templates/admin.html:247 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
 #: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
-#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
+#: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:227
+#: cps/templates/admin.html:226
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:239
+#: cps/templates/admin.html:238
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1579,39 +1586,39 @@ msgid "In Library"
 msgstr ""
 
 #: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:17
+#: cps/templates/search.html:29 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:18
+#: cps/templates/search.html:30 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:19
+#: cps/templates/search.html:31 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:20
+#: cps/templates/search.html:32 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
 #: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:23
+#: cps/templates/search.html:35 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
 #: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:24
+#: cps/templates/search.html:36 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
 #: cps/templates/author.html:57 cps/templates/author.html:117
 #: cps/templates/discover.html:30 cps/templates/index.html:29
 #: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:52
+#: cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
@@ -2449,12 +2456,12 @@ msgid "Sort descending according to download count"
 msgstr ""
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:21
+#: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
 #: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:22
+#: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
@@ -2936,30 +2943,26 @@ msgstr ""
 msgid "To:"
 msgstr ""
 
-#: cps/templates/shelf.html:11
+#: cps/templates/shelf.html:12
 msgid "Delete this Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:12
+#: cps/templates/shelf.html:13
 msgid "Edit Shelf Properties"
 msgstr ""
 
-#: cps/templates/shelf.html:14
+#: cps/templates/shelf.html:16
 msgid "Arrange books manually"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Disable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:15
+#: cps/templates/shelf.html:17
 msgid "Enable Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:94
-msgid "Shelf will be deleted for all users"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:14
 msgid "Share with Everyone"
 msgstr ""

From c830a5936e6ae6b00edc429f4bf2eab7e6cf16dc Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 6 Jan 2022 14:10:06 +0100
Subject: [PATCH 049/220] Added dse to supported languages

---
 cps/iso_language_names.py                     |  21 ++++++++++++++++++
 cps/translations/cs/LC_MESSAGES/messages.mo   | Bin 39449 -> 39449 bytes
 cps/translations/cs/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/de/LC_MESSAGES/messages.mo   | Bin 56049 -> 56049 bytes
 cps/translations/de/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/el/LC_MESSAGES/messages.mo   | Bin 57609 -> 57609 bytes
 cps/translations/el/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/es/LC_MESSAGES/messages.mo   | Bin 51225 -> 51225 bytes
 cps/translations/es/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/fi/LC_MESSAGES/messages.mo   | Bin 27338 -> 27338 bytes
 cps/translations/fi/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/fr/LC_MESSAGES/messages.mo   | Bin 53561 -> 53561 bytes
 cps/translations/fr/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/hu/LC_MESSAGES/messages.mo   | Bin 25073 -> 25073 bytes
 cps/translations/hu/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/it/LC_MESSAGES/messages.mo   | Bin 56197 -> 56197 bytes
 cps/translations/it/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/ja/LC_MESSAGES/messages.mo   | Bin 19843 -> 19843 bytes
 cps/translations/ja/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/km/LC_MESSAGES/messages.mo   | Bin 24354 -> 24354 bytes
 cps/translations/km/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/ko/LC_MESSAGES/messages.mo   | Bin 56464 -> 56464 bytes
 cps/translations/ko/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/nl/LC_MESSAGES/messages.mo   | Bin 50392 -> 50392 bytes
 cps/translations/nl/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/pl/LC_MESSAGES/messages.mo   | Bin 52304 -> 52304 bytes
 cps/translations/pl/LC_MESSAGES/messages.po   |   2 +-
 .../pt_BR/LC_MESSAGES/messages.mo             | Bin 46828 -> 46828 bytes
 .../pt_BR/LC_MESSAGES/messages.po             |   2 +-
 cps/translations/ru/LC_MESSAGES/messages.mo   | Bin 47824 -> 47824 bytes
 cps/translations/ru/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/sv/LC_MESSAGES/messages.mo   | Bin 48661 -> 48661 bytes
 cps/translations/sv/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/tr/LC_MESSAGES/messages.mo   | Bin 22790 -> 22790 bytes
 cps/translations/tr/LC_MESSAGES/messages.po   |   2 +-
 cps/translations/uk/LC_MESSAGES/messages.mo   | Bin 17885 -> 17885 bytes
 cps/translations/uk/LC_MESSAGES/messages.po   |   2 +-
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 50015 -> 50015 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |   2 +-
 .../zh_Hant_TW/LC_MESSAGES/messages.mo        | Bin 48797 -> 48797 bytes
 .../zh_Hant_TW/LC_MESSAGES/messages.po        |   2 +-
 messages.pot                                  |   2 +-
 42 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 0507b6f7..f86e5612 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -102,6 +102,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "holandský znakový jazyk",
         "dua": "dualština",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "djula",
@@ -526,6 +527,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (Makrosprache)",
         "dsb": "Sorbisch; Nieder",
+        "dse": "Niederländische Zeichensprache",
         "dua": "Duala",
         "dum": "Niederländisch; Mittel (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -945,6 +947,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "Ολλανδικά",
+        "dse": "Ολλανδική νοηματική γλώσσα",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -1329,6 +1332,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolengua)",
         "dsb": "Bajo sorabo",
+        "dse": "Lengua de signos neerlandesa",
         "dua": "Duala",
         "dum": "Neerlandés medio (ca. 1050-1350)",
         "dyu": "Diula",
@@ -1753,6 +1757,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "alasorbi",
+        "dse": "Dutch Sign Language",
         "dua": "duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "dyula",
@@ -2177,6 +2182,7 @@ LANGUAGE_NAMES = {
         "div": "dhivehi",
         "doi": "dogri (macrolangue)",
         "dsb": "bas-sorbien",
+        "dse": "langue des signes néerlandaise",
         "dua": "duala",
         "dum": "néerlandais moyen (environ 1050-1350)",
         "dyu": "dioula",
@@ -2601,6 +2607,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "djula",
@@ -3025,6 +3032,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolingua)",
         "dsb": "Lusaziano inferiore",
+        "dse": "Olandense (linguaggio dei segni)",
         "dua": "Duala",
         "dum": "Olandese medio (ca. 1050-1350)",
         "dyu": "Diula",
@@ -3449,6 +3457,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "ドゥアラ語",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "デュラ語",
@@ -3873,6 +3882,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "Duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -4292,6 +4302,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "네덜란드어",
+        "dse": "Dutch Sign Language",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -4674,6 +4685,7 @@ LANGUAGE_NAMES = {
         "div": "Divehi",
         "doi": "Dogri",
         "dsb": "Sorbisch; lager",
+        "dse": "Nederlandse gebarentaal",
         "dua": "Duala",
         "dum": "Nederlands; middel (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -5098,6 +5110,7 @@ LANGUAGE_NAMES = {
         "div": "malediwski; divehi",
         "doi": "dogri (makrojęzyk)",
         "dsb": "dolnołużycki",
+        "dse": "holenderski język migowy",
         "dua": "duala",
         "dum": "holenderski średniowieczny (ok. 1050-1350)",
         "dyu": "diula",
@@ -5517,6 +5530,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "Holandês",
+        "dse": "Língua gestual holandesa",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -5899,6 +5913,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "Дуала",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "Диула (Дьюла)",
@@ -6323,6 +6338,7 @@ LANGUAGE_NAMES = {
         "div": "Divehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; nedre",
+        "dse": "Nederländskt teckenspråk",
         "dua": "Duala",
         "dum": "Hollänska; medeltida (ca. 1050-1350)",
         "dyu": "Dyula",
@@ -6742,6 +6758,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib (Kanada)",
         "dua": "Duala (Afrika)",
         "nld": "Flâmanca (Hollanda dili)",
+        "dse": "Hollandalı İşaret Dili",
         "dyu": "Dyula (Burkina Faso; Mali)",
         "dzo": "Dzongkha (Butan)",
         "efi": "Efik (Afrika)",
@@ -7124,6 +7141,7 @@ LANGUAGE_NAMES = {
         "div": "мальдивська",
         "doi": "догрі (макромова)",
         "dsb": "нижньолужицька",
+        "dse": "голландська мова жестів",
         "dua": "дуала",
         "dum": "середньовічна голландська (бл. 1050-1350)",
         "dyu": "діула",
@@ -7548,6 +7566,7 @@ LANGUAGE_NAMES = {
         "div": "迪维希语",
         "doi": "多格拉语",
         "dsb": "索布语（下）",
+        "dse": "荷兰手语",
         "dua": "杜亚拉语",
         "dum": "荷兰语（中古，约 1050-1350）",
         "dyu": "迪尤拉语",
@@ -7967,6 +7986,7 @@ LANGUAGE_NAMES = {
         "dgr": "Dogrib",
         "dua": "Duala",
         "nld": "荷蘭文",
+        "dse": "Dutch Sign Language",
         "dyu": "Dyula",
         "dzo": "Dzongkha",
         "efi": "Efik",
@@ -8350,6 +8370,7 @@ LANGUAGE_NAMES = {
         "div": "Dhivehi",
         "doi": "Dogri (macrolanguage)",
         "dsb": "Sorbian; Lower",
+        "dse": "Dutch Sign Language",
         "dua": "Duala",
         "dum": "Dutch; Middle (ca. 1050-1350)",
         "dyu": "Dyula",
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index a411e0e77b9bbc20258458b3187b7e89aaaeb56a..83d65d4ed3106413710d2fea6b5d63294a2e4b00 100644
GIT binary patch
delta 16
YcmbQag=yv%rVTqI7%evMiimdv06uvJ{r~^~

delta 16
YcmbQag=yv%rVTqI7>zgYiimdv06tp=`2YX_

diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index fd74006e..9e496565 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-06-09 21:11+0100\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index be96d682b114d04eca6696eb049d9678a1e0376d..44998f7000572dcf6a3029ca7e8f84ecfb5658ee 100644
GIT binary patch
delta 16
YcmeykmHFdV<_$Ni87(&7suqt2083N|4gdfE

delta 16
YcmeykmHFdV<_$Ni8I3pJsuqt2082Iq2><{9

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index d312bfdf..4353d1d0 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2021-12-22 19:05+0100\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index c4b1af88a4f7800b37b4be3af13947671b1011f8..51f9b3a6ebef6e4ed0c61a62bc8baafd55d99c3d 100644
GIT binary patch
delta 16
XcmeA?#N2s^c|%$pqs8X*xJ69>I}Qfs

delta 16
XcmeA?#N2s^c|%$pqw(hSxJ69>I`9VJ

diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 366b1dc1..f19d6250 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Depountis Georgios\n"
 "Language: el\n"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 0ed8ab6e9bb94fbfd135e75d01e100b8132d942c..60df9fd4a53865401f7361d4eddfd9498e00fd9f 100644
GIT binary patch
delta 16
YcmbO^fqCWx<_+`m87(%?&##IA06MV-;s5{u

delta 16
YcmbO^fqCWx<_+`m8I3p3&##IA06LQf-2eap

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 096e7f63..346abb64 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index fe916f5a3cbb89785496278a3971f56b23cddfb0..a6e29b44cf6a2e977315e6e014e5557e668bd36d 100644
GIT binary patch
delta 16
XcmX?gmGRV7#trWFj24?c?3=U!K)VK)

delta 16
XcmX?gmGRV7#trWFjK-Ti?3=U!K%EAX

diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 938ae04f..db52dba8 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 7b381167fc288133cbea7631952fd53ae4cbfb5e..d297f831e7abfb8273c50cd4abc715453385d943 100644
GIT binary patch
delta 16
YcmdnFh<WEC<_$slj24@N^PeRG06jbhBLDyZ

delta 16
YcmdnFh<WEC<_$sljK-UT^PeRG06iWD9smFU

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 782ae51a..5bc1c54e 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: <thovi98@gmail.com>\n"
 "Language: fr\n"
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index 84dd8c56cd89bf6222f7d80dede030949b9a7f11..366857ec676172ae6d580219d8e3fed873bbc571 100644
GIT binary patch
delta 16
Xcmex(nDOIb#tqG8j24?)%yP8>MZX6U

delta 16
Xcmex(nDOIb#tqG8jK-T=%yP8>MWF``

diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 9d27c92c..f63abf5c 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 4a5f451894f746b0bc97959e24d5c5606024ab03..0c5151af302ff3ccadd62a798cd2e93b5993e929 100644
GIT binary patch
delta 16
XcmZqO&fL14d4qffqs3;0iqvEPHd_V~

delta 16
XcmZqO&fL14d4qffqw!{iiqvEPHa!Ln

diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index f21f594a..2ed3323a 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 02ec8a14d3f5c8e64430030fd7987d08a6804547..3b92f0014be87c749df20d6ca9a95ee2ecce4c7c 100644
GIT binary patch
delta 16
XcmZpk&DcDfaYL;Zqs8VrEmma!GiL=-

delta 16
XcmZpk&DcDfaYL;Zqw(fCEmma!Gf4$a

diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index ff4bf4ee..c8761121 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 5042a945899657064c294ce4540999e717b6be05..414c9da598c15b176b6981112b70fad75afa399d 100644
GIT binary patch
delta 16
YcmZ3qk8#mH#tl<c7%etWRq3??06eP(mjD0&

delta 16
YcmZ3qk8#mH#tl<c7>zeiRq3??06dKbk^lez

diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 007d51de..a60aa181 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 5ae70553ce8817c722fbf0a2466ed8885a18f353..6952a675ccf03a7be8daa0b8e060773ce4799dd5 100644
GIT binary patch
delta 16
YcmbQRlX=2U<_$Ni87(&7s@|3W073!>^Z)<=

delta 16
YcmbQRlX=2U<_$Ni8I3pJs@|3W072vj?*IS*

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index f83fded4..36bf33d9 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2022-01-05 09:45+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language: ko\n"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 51c56591730f98d589a25bf5d31a0f99fefc6dd7..1bea691785b264a330461227ad0e2af507767a31 100644
GIT binary patch
delta 16
Xcmcc7$$X=edBcuEMvKim3+00WLBt0t

delta 16
Xcmcc7$$X=edBcuEM&r#p3+00WL8b>K

diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 76731bc8..c321e3d9 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: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-12-12 08:20+0100\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index b1bef7475c176b3a26b1cdc75310671578668145..3d792fa41beb7a58e9be0569da67a105a45a3ebb 100644
GIT binary patch
delta 16
YcmcaGgZaV?<_-Bpj24><iXKD)06<R%ZvX%Q

delta 16
YcmcaGgZaV?<_-BpjK-S_iXKD)06;MZY5)KL

diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index b7a00e31..77f15d84 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2021-06-12 08:52)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2021-06-12 15:35+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.mo b/cps/translations/pt_BR/LC_MESSAGES/messages.mo
index b38822b8a375274dcdcbde5efcd9f3815da8e8cf..a58be84a5d51109564415e24b2506a20d4983eed 100644
GIT binary patch
delta 16
YcmaF!mg&t~rVajSj24>%(&hvJ07;|=ssI20

delta 16
YcmaF!mg&t~rVajSjK-S-(&hvJ07-@ir2qf`

diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index 03816c54..cb69d7da 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: br\n"
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 42feeb5a438f21f55d119e38b645bc7e3a260415..4ab5d9a66c9f38ecdf252f37b0c9155c25f39b00 100644
GIT binary patch
delta 16
YcmcccmFdD)rVZ}`87(%y4}6#b08btW^8f$<

delta 16
YcmcccmFdD)rVZ}`8I3o;4}6#b08ao2?f?J)

diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index d3d9df30..a662e981 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 2843a58004d4c57a2a148dc3878408a253e5876e..289a250514ed096a76db8e382571b307361c894f 100644
GIT binary patch
delta 16
YcmbRGhiU2`rVX3&87($%&QJ0K07g;=wg3PC

delta 16
YcmbRGhiU2`rVX3&8I3n@&QJ0K07f(iu>b%7

diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 61e462b6..a6df7a66 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2021-05-13 11:00+0000\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index 305099604e1ba07f06d6757121bd200dee48c3a9..4b8625aa7652e76b57d5254707b84dfd9f88e256 100644
GIT binary patch
delta 16
XcmZqM#Mripal->+MvKi4ja5|vJJ$w)

delta 16
XcmZqM#Mripal->+M&r#7ja5|vJGlmX

diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index d1f9e372..57b9beeb 100644
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 829add92e69edee8ce1f7ba9b1c7398607145f9d..6ceb43260c3dc66dd4073cad9be394366d7a6334 100644
GIT binary patch
delta 16
XcmccH&3Lz)aYL~@qs8VD`AjtcJGllU

delta 16
XcmccH&3Lz)aYL~@qw(ev`AjtcJDUa`

diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 733687e1..7982c29d 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index dd3b6cdeaf3d2e8283f0a1ea9060e274b1483b94..24d53777e7ecf79a3b9d2828da322593aecda3db 100644
GIT binary patch
delta 16
XcmccL#(ckxdBfi-MvKk=suDc_Mw<u)

delta 16
XcmccL#(ckxdBfi-M&r%@suDc_MtukX

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 4ebaacc3..836b1c2f 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.mo
index 79d132b691221f13e1f8cec1223fa0bdc8431252..15b7b64ef1d3e1d5871b30fb96e8a30d1de65489 100644
GIT binary patch
delta 16
YcmbRHmuc=_rVR(n87(#+D!=Up07+U1X8-^I

delta 16
YcmbRHmuc=_rVR(n8I3m|D!=Up07*OuVgLXD

diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index d64da8b8..0a3deead 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_TW\n"
diff --git a/messages.pot b/messages.pot
index d60872df..8207eb4f 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-06 14:03+0100\n"
+"POT-Creation-Date: 2022-01-06 14:08+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

From 8dd0585919046ade5cd403c5f43e37e54d5d3098 Mon Sep 17 00:00:00 2001
From: byword77 <byword77@gmail.com>
Date: Fri, 7 Jan 2022 11:07:19 +0900
Subject: [PATCH 050/220] Add files via upload

---
 cps/translations/ko/LC_MESSAGES/messages.mo |  Bin 56464 -> 59876 bytes
 cps/translations/ko/LC_MESSAGES/messages.po | 6344 +++++++++----------
 2 files changed, 3170 insertions(+), 3174 deletions(-)

diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 6952a675ccf03a7be8daa0b8e060773ce4799dd5..78088664d156cd9ef12df4f5c9e1087a08a06db7 100644
GIT binary patch
delta 17856
zcma*u2YiobzsK=Av12DT;cxGVRm6(DV%64`8c}N1to^rR1mPA$lb|*!Axf;ODyl{)
zYE<c<CHbe-R`)ueZ?4O8JkRUAUeCE-=koqt<G$`|-FK3nb7Br>xqmf__ikX;ScmJ8
zzvGm`p+z0%K^DhJ3Q?)!gg0{>ikuc$8~b5-T#7YtFY3NK7>K{we4gfx;~`%aYhg#M
zgwt$(6XtXruXBZ<7Zta$H-?5gP9u!MhIkUQ;qOQjM&dX*ARHN|(;hXz2&{}lF#w}6
zAFjnbxD5+o3aZ@)ndM%`c}$>&e`OZXxTSeuaa2cTtkqEM>SKOvjT%5t)ByXU1~LG(
z5|dHw7Nh!!L#@;nEQcpCFVA=G6X=E?urOw8<v1m=Bx>XhumrY7wHt_aa6IP1t+sqG
zvZT&?sDYkG&G<GB#qUrn+q1RfG{NQQ?M!f<pa&Lj<2apgG!DSS7=gvwI!<+r#Im>&
zHG>o^f}fzyLI!FACEC#!hGKT?h`F&l7QmM<2aajS{%gr5Q=lbUj#)7dgD}zN_oG(i
z5NbuPq6a@mJ;<-UxxXY<CSM6P;4T=7(@+E4jbV5bpTnRItiSfIV+YegH>^qi1+0pT
zQ8P-xK6nl_;IbXfmNY`;d!hz13WIT>t>0qnPuTno)YklfnvkED^{z+|j9RKzsJ-rp
zTIxuwf>BrjlaWa~*Rdc5vp;HA3pIf5r~!?{K{(ImAE5gG3(I3x_B{Z-RS5LJx~Rj|
z1smZY)aiW#^?==|y}O7yRCiJBe?$!=dzZ{N(<z2E$oEIBY!v3fWtbD!V_w{h_4NMl
zBT&a*qdqXdpl+zz)ja4q)D4|bGw+AFaT9W&owrbX{ypkY7Vl<WvnHqk_CuZaQK)`*
zVm>^G1$n-6nm`@i!2I|XHpd@P53bvtge_2qauTZjV$@-cMZE><QCqMN%iwv`%BEuh
z%>KONl*Xc{fj)<2dA`$+KzlPC)$v^Ga@2s<V?o@7It#~;|8XAh59iTo$h)g8nTvYh
zT2w##Q3HI(=1-wk;3Ld|chH-Q;68ym_!hNCS$dj7lm}~&uYgstJ8G$?quOo8AWXty
z_%3QCZlPxU81=>T<NL0Gl}0_U5$ce(>c#qNFJ7QPd-*CVzX#RPanw>?LoMAC)IfrI
zn?u<YHN%0Z2Mk56lovIim8jFc3$-<uPy>62di{Ru&H8JP3->WIDUXH8H?Vd_jd%zK
z;%L-sGaI#(OHmJ8hkC#+)QY^1deBYOz#pLon6s~$V0lzOb-V=H`=+RlTB8Qk8`Z&3
zEQFI#BVK|!6WeV4LDWFbq6T^mwfA>zeHv;-|F8!1GyN7vy`J7`1Vsr#u^zU^A~+M9
z;cDwu)Ib9Jn;$-vu{inusFj(Bnm`olfpMsT?m!JN74>C2jhgva$V9!)w*<QJPt;1}
zd%+yC!dR1hQ>=?4QD<QT>Mb~dmGGf8|BL1U&slq-mVP{T#g(Y7{Q^7VFPKm7f18)g
z1AC%oJ_Ge&7u(=T)F(Q}0JBmxQ8Q|T8u;^A4Tqu*=L*!@aTs+t-$Tv#EUMp+Q7h>T
zWGi^SQ<$JOR>Cmsi}le(?d3VtUR}q$_$g|jkFXRvFPjMjqsrT$2K*vwh32Bp(oWQX
zkDvx{0lg&&z98V$cm6`X-`)Aip^m1a>SM43CRxv7WAb03W>$Kz*}AHz0f(Yy-o)Ah
z)vhh-kakD)`@&$>Ux(y%3N*qfR0r#@8E!$1_$%yyKcPBmKE#xFMD6K|s6#g%_4>_0
z9nM(P!1rP>eu&z-hp0pU(-5yI$UD^hcrAfC&CRhPK9BlTE=4W9iyFWt)WDNaGdX6x
zi5kEY?1VWZ&F>98Q4>f)ZQ0ML`-8m0%$KS>s-TI@M_?WDk=O#)VH>=S8oB2c^95{(
zIy?O_9HX&3UPP_v_gD=5hnxFKqT1KRaP&qJ<RsXJTI#*16*!67t81v4-?imF%trnn
z%!=7Ym{T8sT8Vn7e!8JnYA|NU(byCxqR!5KWF>h22{gjoubKx|Kpnmi)ZVs1ZN&?y
zJzk9(z-Fw4J23!np&oP}b%xThEdGL8vEn1mz-pt;Kr76A|GN>W!-1&RA`*3YrlAha
zYRrNAQ4ctR)$t_i!<2zqiL#^21S+B0hoV0=L=ChtYD-3<&cF;T%=vTT2&&;;48_~%
z!Q7)ArzO@veHX@JY21Z+;5pRHE}>TDYt#dO!V37S%?FP$XTpQ(uQi5X6neE62MM0X
zA5b%DGuE8esTe^16!ykTsMB5XH8Yb&n3H@*^k5I`MAXv9Vm>^CI?QLV1^$LQq>ab1
z|Dgl}$C;VOU`_HTQ8WF{=JSm=hpP#;rMxd{MK)jqyp39szzJqRMKLdV59Y@ZYcpHl
z1+_wbCb0fN1T!eegE5#36Hp`HjzM@33*v`Z0Pom*2CDr(7=*bdniUI1J-7<0--f8O
z(*_G+gmsXYKn*5a=b_$)7}O!!Y0LMaX7~<fZVBcle+kw8HtK;tVj;{j$$a^Wq4IT6
zOWq!}Wut7lcM^d<kxQ@=ZpF%Y0kuR=P!B3T*{ncC)Jz)Kd^2oMz8ki~IMhJCK)prZ
zqb8X9b+banP!p?x49x4)BT$15s3q@>x-k;9q+ZkmU7KHz+S@(0{1|G0r%?TTgqq<U
zRJ#YL75mZV|3+<Do+<kCo&7ID(1?N(s6*8gHNq9Bj@F`<ej{pNTT$PO6Q~EAM$P!D
z^()jwendUUf2x^49#nY{YM|vX^Y8y!wxTI&rV*&`K@Y5hvrt>K56j^NRL9?8ar_N4
zJDz4fSmjXtgrnNELp`uN7Qq3i!#oMSIvi01buk{bl$TL^e+RV!e$&ktD*#nq8MQSL
zSQKBjPC*^A7}Ns}pjPq>Y6UOZ@~fzRA53TcwRGQ7pppHJg|YAqGo$LLj>6D`5vT!=
zMh##ts{I<&K$5T|zHjrNV=?l-qWUQ~(>$j<s-Li#?0*S@t`w-jtEdiVpjKiPYNUy%
zCEbqoaSv*1?qdxsI?J4$)>xIi*SZsHk-uuq!t=DXb+HN#@DgZGqin@4tWN$qsw2PI
zX6DsVH$<QYG6}V1Gi*K?bp{Th4(A!vslR~Qf*Uq}4|RVUYURD(6X;v*H^=<aSRQMV
z?|^0Sb@bp`)C#3y7W@!(`Y)mO_Kx)n)BwIlt)LG(;;*PLXREp9SG%4_JFnvs1X2-)
z`dN^Kn%QTlGf{A!c|EJ3mV7X331hJ|zKgZ-9#+JH^UVMnpjMzMX2JHT2}D>2V1B*-
zuVn^~GaEJI7}Q9UZTU&mz^<T{(tm+j>HyRd7Dp{<Rn%Du#bE4&I*cPwuipaHVO)i3
zzZ*R~-`P)~y}ODUz?U}fztGIIAZq4KP-kE)X2*3{3OAs(;uu!O53wiyfO>GdC^PV$
zs1<z?)qVncwIp*0^!m7{55{iP$ltbJ!K~ynQ0;!O1}rl9a;OP}VNUFT+3<PPO7z7X
zI2m)|EL49{i&%dRAesX0RU+yv>_iRZ80sxJgBtl`R7W`$n+N1aEqP(o9*1HG*25||
z1S?@Qs^1jU%+H|S|7(j`|3(ClY(@Dc=G4~4T$DFOjkFzVh7qU^Ucl@)0(DkiL$#ZO
z0l3iSSE2^C1~s7dm=jN-R_212Kuelt3;dU|r~Vua)LCe{%>2sq66!;<0o&?En-5xU
zW)_YWDer+*aVmDe&Da1luq9SpVFoZ9Cy@7!BY2760XD-{F~+%=m;6cWg&(12Tydqb
z2I`E|#hTa^3*b!aa_a`vQYWL@owoTOkuCK)Iaiq*%b=D#)Eb6C<XfX2+!r;Vfi^!H
z)qW!C49voU7>BxVH>&*!)Icv{S$u>VXl_^S+5b`m8es_P)7uKwU@Yo}*{JvSP1I|3
z6g8j%tIY$7q6SjY=4+w0v?(scUZ^d&gJD=GmjB9%U9l6-cM=s~8ur5H)|g+%qp>pi
zd+5O&Yt5mlf_gw(?12MNGu)3_iA$&fK0>X)W7LHHw&nTPnF$v`uNqV*&<%}H`EZ->
zg6gmrs)N_CF3v$6#<wv5zeF9r4AdzPiZfr#CfJ$$Xl#o|u?_mKx1Z$otiL*lpg<k=
zL3K1A3*jytf+tV|DF24Bp0y2fh@9S76h~taF0jU-?t2UMHob$|;=5Q21L9eK%{(mL
z9G(_fiF^;#+b|8Q;bDxx`>27{PB87-q6RP;^?>;}6SrV(ESG5d?}?h=3z!ENVF`@&
z5~zb@)EPL7nnBP8v*(pj`Sz#>zi1tYn(;!MfQi@u12>unc0_Guchun=X!9em9{Ja8
z-kU@aM!^x(R{Vs4=xj185`>u_4x1m2!>OKzq4*VQriI=#hqEnephK}YPDKsmvh^<J
zBkwbLuk(kk$hDdO5>7=?)D7dXDSA;$bsTf!P1KC;V{!Zz8)42Z=F8U-b%sWv`dMZ3
z8&QYz43@<2FuUIW+*{4e15t-17&XEW)CZ+0>c+09y`6&N@n>5<Vw?F+Oh?_HfEwT)
z)QYB}erTOS4d^^($6Hu}=R2R<f<LerdH?O^y)TJ6e66fwP=_ZDwfEbw48DU}p}VNF
z@*7sbygSUV<8@H?^~PWvf|}qQ^y-5XL!gm=jq3Op)Sl+wX$H~)+mauF<uMtv<2BTP
zKSka51huqzc9|`xf~xO=s(%GbqZc*M#9gev4$FQD<XPMB4r)M8P<xzhx5<}5Enz5X
z#?4S2_p^>eb-Wn$pafff%$8rnT$De=9Qea-)?W|)odR{7Kgo0ujOw^Hs-q65`r)X7
zO}0ka@^#j2sQwPv`g7LX)^ya${fQMZi}x))9t2fUBVUU;T)S}`mfmCjAc?`w<hP-g
z^a*MpdH0%ul}6=j*nCrKC)9xYp=LhDmQO)F&%2O7BU+EmaTA8)7uXWZC7V5sMAgs1
zW_Z%->@$b7Iaa3pRSd;dI2=!5UaYa-{ICi`ZRv7s&GVfd1f?j*K+P~9#r$~ei+bR8
z)D7RDI`TVUW|SZG;i`Zd&_L8g5>YeVib1#+>)|OZi@%}=OT4XLNZ9|z1bXlY?2d;p
zH|9EM4oP9ugM+aUR!40?IBJ0XY(5TkDEFgYzl&G^f53v6<&e3*FzPL-h6{PV)0Q9{
zFQPimmumma#_HrFuqsYLmdtq*HNbCBGyV}Zz~50b&w1GVcnw6=7eNgq7;9mO%@4rL
zpZ{YCbmL6ygHfmv-oqF14-CM*N6dqUpz6n=I$nlanM5p#DX67Bk2(t(sCK1~n)+Ip
zk9@nMtiKxera*f&1>0aWYCs>OZoGq<aR%x^zhOztcg%bNtD)*UVtee3!*By?#j+na
zKV>_i9y}OJ;ke_hzxHN11;ueAw!kA8fq$X~)ZrcTpcPn&{9bH_pP<^6K4E^l9f^VD
z<4_YzLOtjbY9Q&@0Yl$4TQki|prxIInrSp@&l0c*Zo$HM6jgr3dK2rBzlR!7p_66;
zjZrJv3)OxEcEi`O6P`qEQQr5=z`PX+wA3w86%nW<8j8(u0&2<kquQOtCU^xk;C!dd
z50^658d#e0MyUS!qT0P?^K)!{95O(!lS-fmoIq{CHPnN@MSY`dzHeqyAD<)N1RLN4
zTfQ6hfc=;UPoV~S8QbD*)Z0<^wE5ex76y|afZg@}&mibX!6jQ!{0u+q$v42}7=`8V
zEM~<t^x$`>2NpPMUbkSZOuj7oV+Yjh7J=$#2G+%6*a#ovc%JW6`@oDW0f&&kfI1VQ
z=Qx<y7|Y^^sG0as5B?o%V2%&X;jD+{$@j#}w+TbZM`J5Ij@8lcyxGE<=&eJ+s|0G8
zfYtC4_Q2n;0(QQ@KH_-PN}NZX>TgjilKZ0Bq5`O`D2iI*DyV_9#hln5YvK^hiz_d(
z{t7lwkPF|k9zwmAC#_de9Y3)7pHb~|UNR2|MCB`4LoqM;FwBnaQD>~HbtvW|KlKvp
zuV4`cdfnEdZrFqB;BA{fg#qM0wB^^a1o^K}hxTvOX)pGX`Gkj}2HXL|us^EbSk%Pg
zQP11sCD0O|MlD$yYOix%HXT$$4Wu!ugAO*|4PPNY0Ci^0*z#&uOg{}#GwzKZ9En<?
zXw-n$U=H*q+lo|M@g8c=?w}s{7&X#gtoc4R<rPuwYM|=FQ3LH`jYO^31T2WNPy>j;
zEVv%S_5LRkw58x4YDAT;n!^%;8bAZAg3WCH71V>qSZ7$5pdPpm^WbLG{mIrtw*DQ=
zNBKD{p!ff#ZSV+dQt=qIXQi*1A2R(=1DJ%GK_co4w*!OlENTlswe`+*Gk^drKzUKr
z*{FhrFdQ|3URYc2{}6)Q7>gme2{rP|sE%)-UdumG9ajFt?y<EuR;GL+24Xzw{=L?N
zs69W9dhiX@mOQ}B|NZ|j1Uk(@H_S*wP!DR0nt318kK5U(8N}QAeOQG2dsq~2+4ApE
zE8~CDv@e3{uR2!3CaCYokejT(MzW9s-LMXeVG?Qvr>z&T1Np0{FIn&{^GO|qD&K_q
zAf=-RbKW+;URTAc<hx>RoNC=|{p>dDUx$kPpPB|OtrJl*-G-XkQPhC0VjH}TI%J+Z
zW=U(J>Kog9OVnBEX3P6q2if}JsFj%PCD0xxU|oC<wU<BJ2BkkUOV<YV+VsYf*dO)4
z$<~?H`KXm#iXCwSYR}WK9sY{CFZ{0gnc;0m(3*l*urns12K2ivFLTfQ89vndCRU{W
zbJWUZ|J-!c2-R^v)B|6}95@EG_mi;<Mxj1%+mRLaI_C&NDY%PTvix6|85GCn<ZGhd
z*U?xQXINLE9<&3?;z8?8tVjNL)Y+=_rI}C*)RqlHy-gD^Nbi3lftGwfYR_+Dd;AVx
z!iHa&zhu^+2KW!EeXjdvX0=gE-4b8HWw!h$RQv1?%mWLcR-!R#!VwtA^PQOl8d(f#
z00~$c_oF(vf;udpqFzV;uT8!>s@?Ob`^TZ$&%)}s2(#k>>rv}_sFgg2-T;Do1bT29
zYDxdWnwa++Q{EWWaW~W<?2lT)0XDxF^?EI{<tMN*`83pw10R|XP<hnb)D$~muZOI^
zJ|LSY&=)Wj^`Q4LJ6=Ma=Iho+w)`*DK(jtF?E+B`DsJ=DPy?-vjj%rE#IfkXDb~10
ztbbJsj!@u-_4%hODc+yI192v0IdL-iGsJsIPp?-gYf0u7^_y%VKfN=rjr_Zd`og4F
zs2^^Mop>Be{^>Q(OXfKmRU_@7G$(GcwU4N4LL7-NQ@#$D;|rAOWPeENPRd2nIq;`W
zR~eEYZHJN;kaV>-I03YoNm&(KLz&K>bDc~Cg<5i5bBQ0LmaZIi9Y}AIo~V-R9pV9`
z2;$`=eYlR2s#BKEy|svSC6mufIzZCZm^7ODNw~n2Wj^1zM?pslR@#R9t#@d=lXwO7
z`ANFUQFfoQKZsL_E0W$Nu8g{R-~`eJ+lR{7-OTG7${tczg51N*dY<3IHe5zUA>vpn
z^AhX&n)EYq6WgX6wx#S%TR(*SG~y(iuR+}?+xBJR;*|HpTa^8YmoSNRmQ<U%(q4iu
zsF+Nq5b5caOmO#^yvmP|FG&g}uFQRxh<mGos|)#Qn4Xz4|1_sQo^+hLXRmGKQz@8E
zop&^uDFpQ?;DhC4BYz&l>`iB^D{v-h4|Te3bI&sJp|-x6bqeZp{U!D5i1*+TtYqsW
zFdOyyK5%)R>=e96YDvSXn20w>Uy<~VZzX+3{PY?@FpK;oQZeG=wxZY51~`Da_vq^~
zN!K{+V?yT(+gEYQa{00URVZj?3rkU0lz1QBAnBSw3Zg8G^ck`KKV@_+A>V=I5;w+D
zq(#Jhr5z8cD(O0D80{ONu4v+yX;+ohi}a!PU)Op3#Dq?J;v%*@nnu4;e%IE$O<otj
zEIXBmm)iVE+8@lUG5-vCCVm<gpv_=1ck!$W(aR4r=dkUhKfXn(KsrS#Mcr#O(zS?u
zK~gP}uBleVYiRSF%?~FYW#c)-`-nfFO;h3n#65^RVqXmMH{Ty8D+Pa1FpkudhPoQy
z>y#HEo{uMNx$1V2E|b0`9i=Xq)Z5ml5x+|sL*3JBF?E|LJ4mWS(iMO={n`IlsQiS~
z&vu~75mf$!V<=m0Z-^wnl$31q$FVSZT~CN-n9%9VJrkelOU3%>`1E>U?^k~O)BRVb
z4;2-;u?lfR>`Q*XZ5)LSDSrdoP`4R#>L#vS_F=`W7b#n4;}*0#O}r52X0|r}{9<G8
z2UNUIgHxnp#8G%2bsaWj{@(@;qWmYy$Jx5I)cr#|jq+EBSKIPe@fgWRSzBB7kT`_6
zKOP|I`iA^KKlZ;W9ehOUKw%{6^59?_D_@p4H#f{8ewVmB<{`g|^dj*Jj6q#Ll0GFJ
zrCl@po;qD$lK+udKXG+^ixss0|9Q=$AP1EVNbitB$a8Pzf0p+n*iYPwl#e=Hft3Aj
z;|avAY^=IYq>7{~q&RhAuPe4qxu?(HML}&EjIfQ$<NK6#<A%>k`u%PL`6ZMO$08(M
zJxO&aTa5Y@ZaZl)bt5U;O}veyD~L3kG}7KzmUtrZ)8~`rZ*tOeq%2g-qJtfnouumm
zd0i_>-;mZ&K2QZ*xk*>3KZGSH&t~t5!S^X^YwvA`4@hy8CsBS=`(K^lb<!PD4JyO1
z5q3shp`^>UL*;Lgu2O%F^z{0H`Z;9kJuR@7#G2GC!*0*?@iF(llzBh%e}l@vXDSy_
zkw7{}Syt*!KT}86SwQMa{a2YCsDuOeOdEgVEu{IBFC?`l?o8WGSb_Xj;xfd46OYkp
ze2an^c+hrupSVBq9a0*NHj>x%0{NcA?~%SEO{MH>yoqt7SbKjK{F!_wn@`a_<ZF>{
zMEo}KbX(`$YlEv4?jsE%ts|YFVQ<nA;x42n#Ja}X_6a8IWKe#?#`US2XY2L%fv)dJ
zA5gZNb~Q+!+WP#&+qD0>-XVpPYLb4T!b8eI!&T&UMH@2z`_7-#y=n7_m_jN`nXZ=%
z&TrV&#;?;)B1zXy+U+L(%;ulh&wpK$4gdCUc^U`WlFeAs-ZX`Hsf|@#koYw_fOaad
zS7XXAQr?;L7G?FwUwh_0H5;V;w`0h>ts(grNhir|q;VJG0;CT~Ey;h3?tgTm8*AFK
z_0*pw)g|dVO&UfVPJQlY?psAXfV#|Qk5x;qy)+Ddrco;K^EUsOx{kCdLB2W8$1<dk
z?1MHFe@}T<)U_V3QCFI@m2`;w7SaXVKFTyRb9X7cKtX;QTqiz8T!6HlID|4?t*{R%
z!(<)(<ZMIz3#3bwogxh*eMuTk>P7u+T#f&rL%ZK00be4uC+*Sq|8p9QqGBxt-AN~i
zmyj+}uIp>uM5<1muGzM{8u@eNSCihRtS;#osVM1H%6=e)(`K-}?<B^Oa!`K8mJQV`
z=GYA7PCeq{3b=kH_K~I&|ABRIrz*G#lh@UP`wx?DlO~a#y*{DM=eAu_yh_?Zo9?99
z#I4bLjXQ?gyRu+D3foaR7yrhA*oN{ium#RQUH7P4OFSNRO(bo9T8ASuOU*wUAcnH$
zq#?8qCH+Nesy_)|qq3jvM9nLaR+4{%#zj@Yl|tOwgian}UBCIItPknaw6y2-5u-+V
z21j~^MvjV{7&+84Z0vZ?Ac`hUh#Ws5C4J<a{O;)K5$>1Mi|1(Isa-oP^f}jm#`Er=
z8DVb3jJ$6Cnf={2W=yExIG|nRn8@*i=%QxJsbQX$g9b;A^3(}w7!n%Lx2CNdJ3h?Q
zZEWPw5feRiLqbDpyK`s8qy)_>>*v<@HcT1gE$!znoBeLNgy;~DZ(UM)^6K=hsh+g`
z$I~~(dwhut(l>7PWW>(*tzVroYtGcH?&t-D-MkAMSPQvh7MA~4e01S#w@K7hx4@zm
zdDBvp(^FDCzWG~x8)MyFi(bj<`1UPuA1<ouhA+P5mRQox9lWG%%FZQ^{rq=?xtpTB
zZrNp13OlU^jT$j{d}Pf&k%K)9A?;9Vn8!V`tdidj_uFM}yIYnIb91j~5okwxz_)$2
z#}~WAmoVGC^L{bUf1SgQ76178g}K{TUUsLf%5aCdn>st`+Y@~Uw`i6b^OK#Yi||a>
zp4KfrzWDjR!|VQA|Bn0kY$130>h<ov)rH;au}A&FQofG8mc>0A7aZhEIFP<`wJ+fq
z0fU~OzI2hhF|L?fV11vI;p;p2`*~9K#V7c=T@$0+8;PH|dp2aa@f$x+nYpQkzq@Pm
zNVmwAuI{ic;qLY=Q(Vv1=I+Z|`@8RNZRM8zxUd_%t+?A@+s2fe+urwc6L!q>Pl$HQ
z@2n<z@2n!CcD54NcK+&K+;y#(<4atZzUydu4BNahJ|i|hGg^DVJ-WMxn?Gr6oBwMe
zGUl>Q(b3G||G6OU^`uLMeDNDOKN+#>{&%-LZgQ_e?xD9zy51F~a@Z5*7TfbgL%gsj
z*md_+&SlPBM(hrE^xmtg_<e7AcT{ruf3@G9d`iUu`-0t=eU+XTr(D`s$iKpt^sWDO
zyHd&>nC|B$zTLLrv#T+0(f@zL-TDV-mht%3F7zctJFH_`%G;UixNm_kVV%dfCe^p*
zfIDkV(b5i!kg<LT>#Sq#J2v~-bFj{>dB~HCMNN;5PG7Rx?SH7U=0#!ke-(Pt4$My9
zmgGx}N#Dxq&wVR%*EV{5i+E1v^WAR_jd6RY-YP{G_TBL%q_Vc_(o!~h(vx?lC#8nD
z-43@Xn6WZmTVZxmFS@((a8L<~d~d|0$L!=_rZ3&%m{#h{J#*NT|39kT97iU&(~qnw
z9_Dmw-PXg<(wD7ve8*R(ryQs<a_r!-Ro%)*=eoO&mUAy2JzAuO$CrHEmoVRxzH~Qd
z-xqs~f$ea29c%6WaqL(3$?=|Uhj)(qg}B*Iq`B>e7E1Ad_uXtMr%vDVtHLc?d`mf|
zOXGcsD}C|DGCxi87U}blve9>V$J68U>DkQlp6`RH71DR@NOxJBxk<kDJ6W^L-IyPr
zmOPvPv8(6K`=F_x$9?yM#=Lodd=TL8W<THB?Q}lejXvKo<;MB?{%+n&Z@S5s_G>dn
ze$=38#)4?yk}VlaQZu(8e!h0|nYWtBr5s3~H$Q~$XL4E!GmMKhJD~5U8*sUa`$tOd
z{0F1Ck8(yradUUv<;rf{<y80iE3Ns;C0=RDzh7M$>bC!QlbiN&xs<$Dhxw&Uyq3$)
z&6XPI#$1m``Rsa#U+v5<cIGOu{|i`*beGq79Uop^==r|2G5`MfFi%R)8+rWbd(6!$
z{JZ65YfbC>o5iZ9C9krpI(|~5Cw*Ov_I%i&Q4=E5w@2GgxQEfEFWH*X=vHn&_tRAY
zZr9r#+_>AzN^|b{s%6ZZoxUuYwcr!#$ylE1+rH9?d~MQTx67x0^02;ls`~G6{s-+5
BR1W|E

delta 14305
zcmbW-30T#|{>Skjt|;JwxZrwl7XxukF>}pb(bTL=OB0teDV55sjvAU*FwrB53JQse
zI{_-@-ql<x%@&sy%`_Lz;b~t?tN;7MOzFM<=YQ}2=|1=2H8a0CGvE2n%<mxgUjDFT
z@~)EZ^TDN39R72ygyYo4N2;rK`#))sj-#e@Y>C^k0ba$sFrbC`Tzd?rKFro9po{t(
z<iE~3el*6@w*DLXJC56lh~h&$XonAA5_Z5#*dFUJYiWD{JL4l*7SpgKW}yPi#wK_G
z%i}eyfZt;vmT2WTAy^UBuOS99ztf+BIzCj~;5ZXd6UL(knqi%b>bD3hVg@RJ98~{&
zR3L9+Fn)mQ_Z4cKA5j^0T02gCsDnYw?{uM{4-CYrI2vo=bEwEYSQ9f){dOZ`IVZ3j
z`n56b0Z2-nx~M>#U<kIuvDgol*&MtF3(-A*LX)<RGX&$YA0ER|ShXG5!D-kW4`LV=
zp;l1wZpW#Htx#v74{8C=VkjnI8C-_}xCJZWF4PttznlD5r|<y{N>L$}!XL2;{%Y$L
zI0(u}6;wuApbPIoO*9hq`R7o3I~x`7M&uYdr%?fxW%<$A23dm>*Ma<N@7B?v0XAa<
z?!;#J6>3El`P6W1gw^pStcfYMo`a#(k76DC5^JK<(e$r{s<%dM%|NV$Bi$4lQJ9WO
z)oN77b*NMy#HM%&8)6_E*9%)>Wt@)cmxu~r3o5`PI2te5de=^7{D)B2_c7Fh-3b&l
z;X>5m+K4RL*^4^8Kcglnd#~BMW*9;}8r44r704LuiqlZ3-hs;OCDfK(M;*?eFbMxZ
zoj)gtORYoE4Y{h$5Yz|epe9<3`oMbB%D1Bq({I=v%XKk(J^*zn<FPiTq5|BGB*8g~
z8n-l2Y72s~vhIHv1r695wc^gm*iH;;;)TdfbJ9_V@)WB7SE$4KE$SBhgxZ3jZjMtA
zo1ik=3$?&8SQn>aeO!!T%<pWcpuInX8u+}m5Eal*s1%oBxjG9q@P6!yeQ*gXQ|D0=
zevcZbLJt#QO;o)eDg(_?*RMUg^#bWaK?C$f?a`yCLo@;J!kMVsumyF!&Y=4Jfy#*g
zeFTNIQJH9qT5*5WR*Xai_5y0Y6x8^u?<4=(i=8wOwDUHqUcRRpC=`{-C{*eOp#q7+
zFkFtMa5rj#1E@@WiVCO*8(<j@j<zNo6<80fg~NK0f9>%zG-xGm)P46@H=rWkk2*}p
zP}k-&R4T8cCj0?4L7CoW92aV$HmJbwLj^b%wLmv&oYzz+Lt!~;pbS(%xu^jSptj}|
zD&i}sGf|?Cc^-@kqyZ|>DAZm@qdwmgHQ{jUINKhNrD=E1rJ%h?!Zw(N+QW0m6?ML`
zw&-gDnT)Mye+9MT9jMH_k6OSb)Pz5x0xi|g1Q>#KsE1*B?2Ihb?ewLf4?c*>#1q&A
zpTP)Rj=FwFP-o#LHpN=~%`X%^tWTmQSZvKfrTzrQU=eC-I}LCg{_70kM+M#gObVJX
z2etCE7=d3S=h3M%(7d7_M`h|C7>Jpuz_(&J9>8YkMSrZytU8=^Q7dkM8aEQPrH^1G
z=69Z<&=O~3H0EPl{2BwW(IB%|Eis7t-KaqCLtU>&Pz#uD+cU8d^#W{+=dlu&9&7@x
zh6<o5x^<{JQ5b>`p$6K5n&4y9b06yT`t#P24X`8Li(1(WsI8lW3OEV1@>FX&s^9Ba
z4!5Aj-FZLxuSnrT8WiCr)Br!A4xgf`44sj4=nO^;w9>Y(L+xn+R=^Wj1wTg}&Tmlx
z2Mjf5qcLjhdZ4y)@KExvhKV#Z#Ah)WS0cYNI9stSUPYz;Yg7Qgp#t|GW>!+e+6EQC
zAmp4nV{tg<pcdf&fZ4M9QJ;@<Q_!1Asv*_Zv#}NRgUI)a^8@NIwqrC!{vzrPxCC3`
z4(x*0P;b0u51Nb)K#e~NtK)O1{tK}Sx(`y&X)W=PNp%1!19eb)6@^-Pv~BN=dU1?E
z?eS=AhT~9snvB}A&8ST6L!FId$gdL4`>3;1;o;&;aQ`XPpkX{}!kJhN=VMjO#P+xo
zwa4F}0{8=4VCfNNqPD1sx}eTbFI0wxpjIA_3Ty#t%U5IZ{ohPM1MbEUJcyxq8udc?
z26YB1JYpuOhRvzh!PeLZm5G;73z&`SpM)iF2`bQKs6&1PYvWn0s{8*Vg>VcQX?|O6
zhc4>lk*|Jd9!BFks5e@fQD(wMsFj7IGSdw;;b7EZ9%}2;QD@>s)OZ;fiI-5ne>%aB
znqMdeqE?iNeeh${9@cxz{L?HPb-HJvR+54`JL}Me+pO=SQvWR~uqva?VXlu|sSiU1
zv}`o@KZ?R`8l(^PimWrnth67h{sh*-RP2fQsEpjiyRqHlCL@zk0Zm06+80r`YQA-a
zeZCQup}fc4W<_Ud(4p|5_V5NO@{(iC^I+8BX^dKVdt2{=>OTUNnOIcDrlTfKK#jWu
zbvQFoXDr*g*KIp|V7-944L;N%DjjPE2*Og-Yhv-1piX%>s((AwgfXZI9>tnC&DIxU
z1L|3*3>~%Y?o$-h@d`FZzj5X}peZ(_J_t2YJSqdTunc-^eFgTWz8QPrkElR8jW@Sw
z04f9HQ5l+sWpN%7sM|@Vpbl$MDbGb+zk{d`e2Qi8Yg_*bwYTLbnD!c|0PCT~X^#Hb
z9@VcaDq}IW{xE9GCSXbCccxJ2K*O`BLzRPN(To20Ju3CLP=WbPH1CUAs0qSQD{f)!
zj9N$xmcvn~1x&E*ai~CF#^QhfC)x+gQ5~}}9Jisq13p1*QP30S9}Z2i9QA&vfQF$a
zjKezkGHRSORKGQ-3Ado$tZ$;W@)WvtST0d$jlZB$dDoL>@7tp?FcS5~8fV*IL2XSo
z>IJmN`VneiA1Z^tqcT@!l4%b>jaLVivBs0gzanZ!gWmN6P%C*HHP94vVFD`9wWx{T
zMD;&`3g9y8{cy|HYdmFcMHFhBKB##{pvIYk%IK?4vH$AuIt>~y9|Q0>D$>)aR9?Wg
zcm=g3wI`c@8O5N^%!}9zcUmuE3+e%J#*P?H{Yh+!OR+xgciRVFVsjdTo;Cw@Ko|AL
zQ6ES^1+oRTRr$7l4J%Op8cXBvSRP9~W453os$L!S`TAH9n_(EbJ5XpuVFX6tEUbsy
z(1j<lGJb<4vBVT}>dT<^HpCi=3ZO13gAK7SMqwqKf%jq(s^2>ptowh8LKF>`Q7fxD
z)$COt)U|vJTj2^+3g5%J_zSkg>eI{u`k)4mL#;R-74S^d0uroCQ5ncCmi;fFpcNlQ
zMS9J4xPc0+T)atTG%D5IPy-A`rF1mvFik*RzgJL)F%tuEFX|P29M%64y08!{FuxP<
ztO=kdYJzCgO8cNzJ`HsS)}sb^A9WqiU=aR*O|ZmseCK00YGOC)8YW>iT!QMq36+su
z=&nxT9SV9;TtY=&WG(l++2cm2e&N<`)`w96PeI+5S*R_TkIF<cDuAu_`3}^X*^dg~
z(DUrS_UbeZ!FUlB$PcLN^gAl@rqj(polz6?LZy5FYL6#iBu+wQY9%(tL#T1RsFnYY
zAsG0AIa^^bkbgZGL4!{1L{tFrs7T$Y6(*qic~D!Bi8?FUsD8Up3)yGu$54TtKn3&x
zDnmC>nJG2HWVF7Uf*PW+c?td%j5>@7FPUGJvM_@B73_&2FPj(72-M2vVIy3L%Gg2d
zi(YJx?O0$pj6(&Gi(DLMH;zJgi<#zLzGi(7wbH;@=8wiTQ7d*^=VC4D3s8Y=KxN{L
z^_uktD%Is@n|}3B^#Q0Y9fN$%?M$bjl+U*=!79{Op(f5n1+>f7kD&UWz?yg#b(p?K
zeXjH?rhh0Z&?Xp$-BE$YqWV9JA<Xa0qo7xBy6tcb^?^^Y2HrwltEvempeIlPJ%b9w
zZR`I)-I8TE7q{Wv*lv#bj+l%w)Hh&%ydjz2=}GTl=)oa)9d(~Oy=q<*v8XdL7d1f^
zDxf{66;_^SG7*7gsP{$%7=v2zNZURcwFU9^`FwQi1E~~r`d6dsn^39EMGf#Cw!!nL
zJ+JZ)bK1LNBkKLJDNeyCT!{nmUF?Om=9|O&IF_Wo5zFJ&`Q-mD3cF~~Kvz%^1}5^&
zhheAy=2(|n*P{+m0V*RWQG0*YdK2}zib>`+xv)9)F4z_)p%(gj68YC**g!*L+>M>_
zOAN>Q3;3%D4nR$?9$VvXQ~+ONJuLGYzjk3`Y>8`86P&>aJdc4GxX@%a6!rNwZVDqQ
z^g~Us0bRJ)*3Y9d@}0G8vRQF$oJxBe)FI18P51={;Z-b$Kic{qs4WayWS)1!XzK1k
z6towKSQ(dEv#}fXH*NhloJhUmVzbB7u_g75sKfagD$rkXxcYg_MB}aTSb_FeY<;oO
z?PO4Rm<L<!gK|sEHK~p|gyS&)XQNj18iryjcEDWJR{2n8sCtT-xD%@04|O=7LEV-W
zs7&p^^1A<fDO952C@OX5urgjneeeeI_I2tn<%DAf>UouA<~`8}_4!_?03SqUbPSfo
zr%>a@qb7a@wXpfBGrzNzf?hP6u?ZeVt*FRaBh?(9?pU4nL8wDF0X5J(tb%K>A@0Nm
z_!;WZIm^u!1);W}IS#{UbSv^?3K}>QJL4`?AU9C=H*AF&a3X323$O+*L49ruDz%4E
zDZgl+mtAR|yRa_p?NNaa#}IsSCHYrjrtO%53TO+4;yznHi%Q{jtcgFPCJs(BhNA}V
zhMMRB+a7P*7ofH#6SaU%sCjeK$iD_YVmp3}8u&VDAis3;+=U7((%RX!53-Iz4LHd@
zpJiQaU4xo9AC;lqI2kXxDJb$mtIT~Ki_cI$i&e4jYV#_643+Y2s6dWl@nN;~tG51&
zwM>QyC<L|gW~lzHQS)_01>_z^p$mmatm&wGe;#XLSf+X23Gb!;vUM-&klsR_l_sy7
z_d*O#pgt3ew+x3+{~5KV{nnU2WX57`=65zx7|4U87=zWb%!K1nAIL@x^cE_`?_)>&
z3Oi%iTC<YTsFhAYt#Aq|;JFxvhpksJl6tvyyw-L9+f%q-9Z@fub66I?LQPzRn)oJa
z3o5NQ6E{QEC!!AJY;1_>s4aR6^`7_;_4%(*8T}Ps#cJ6sl=+=i6g1EU)VI_x*a{nN
zFex35{i)AG1^6+R!HcK>uVFd-2}`20(L67O3M2qqU~OCPkNVt5EdJmBo}};~4e_W5
zPv9e1h~=@@Ci8*&QO_Sk4g4bNkS;(iU=1qOd$1**NA;_;+1#oy)C;Hss$cKT<X?OB
z1P#OSWz<Seqdxcr2H>}-6#j+^Ab5*;14g2r55(U1FvjB=?17<M&DZQG)Wq?~p>q;Y
zTa&q!{OgeA(Vzj|Lj_W8n>nSEu^#n&Y>Xe_K)i_~v2Tv~e$U2W>ZegFyN;SD;0;bZ
zHpPc=8fxoKqB48hO`#Hni}t~Hs9y|jpi)~Y*L<L{H3Hkv-Ub!WMAQP3QJLI`nqVIe
z!o#Qls^yt27=sGz1yrWp%j|<ptU$vqRHR2yDQ}Q(I=07qsCPpJ?8ZP$wx(lU>KjpS
z&|_G<FkAo5J}<xB1lSBibpN9$Xa)CSXM7aP;%d}N*5lo{6=U#<ZEv^3Owb7x$UxMJ
zMqp2jMFp}M+u$MV4Sa-p<W9-{CsL?G!!=aO$`qJDhGTu|%dix_i7woan(zzMbt}Rq
z_$`*e&|PN2+NcE$w)I8WmHOK_75(2N2<CTQq%a9Lp$<ij-R1?+02RO{48jwri9f@;
z@H*DRYJ1Grb33d;{b9TZC!-d$37g|B+un4qdB4P>JBkOX6x87u4#gi)Z?eAo%zGgY
z706Mng<e!f%I-H?6o}gEDp&^_q5|oL{`de!;G?L8EU>QJPyV%M8)%SuSQ+<PPhv&t
z7f};@i|SY6fSDi=Rd-p#Q4_R5ot<vTA#?gzN1+b+RO{>mZgbrh(V!1xqXyV!>w8gK
zatPIa5^Lh;7>d7Obqqde-hkn#K)Yi!4n>W-5Vf$SSPipL8Q$-vpp;$4Ff8$w8K5C*
z!nUXZy4!kR98dj0d>jwh_J;p7<FrDpco4cU7L}p7sDP7Ew`-$qcjwv%dr*6J8Z}`d
zD$;MQ{)bF^JygHOsOQnBKnGhNMP=+M)QX=+1u!2=;u7qFsn}EZ{~QHH<T`8)OH)(;
zEwL%KxAoDei6&T|wI-k@T#ULM>8Q_dw7!7>)C*91e+acj9~M7n|1VRBpuvmUv(UHA
zDIbao;AzwfmSbI9gUY~L*bq<K=QmLSls;l62u7Wa2B<CRh+4oPY>A^Vfcc$d3Y{?x
z%iw3I>v##nvEorPU^MEi^s`RHVCt`;KDWY}i8ZKaqb59v+KQ8?!+X(s3yc5$SN)io
zpanLiLl@LNpNNWlj(xrYwdb2qD|^efe}c-07uEj{+a7Y<d`UIJ`n2~)1rmqqKkGRA
zuSip9&<eI%w_{)Gd$0$Vea9S{{;2i^SR2ox3xC8$SnXZ&SFn3fDIRA{wI0V-wBNGz
z7VnXNbsYVkiQI!)SvD%51K1OfU?5gFVNzNP^}Ly_M`1bY_uBT}))@Qz0c_0kv8X^3
zu{FNorqG1KSGGgYNwXDgP}k)?RO<SmCY)rQYJCBVQ;G3BPr)Dzc;CFbLs6fbf-ann
z%IFFlfbI(v6j8(}^NYd|REO2r2`{4}um6EbT_3DR{YBKkX{ZU;U|D<vE8#A5;c?Ug
zyr{EL;Y0IFZ384@Zf7V3tzZ=D7EHkkn2S~Mp!E!Dq9P2#o7OrXnZN0D#>%wEqpszv
zs4d%!;kXN{;AK?Cf5GCv|G7RUy)?ANQRv1AcpkN<y-u4C3`VVNI_eP4M~;v4v27oA
z#`GVDn(%2<|CJbpn=u$aM+No`hG>A_DCor!eAW!m5?fR6h;1<rwFPTYTlFq#fbUQN
z{(+jH+&Qx)(blfk-dL6AF<2gBF$AARw^BNXLIis3gM+AnPooau7pN6ow)Kjin6pp?
z)!q~J-gpMJ;uRQ*o3J__#$ot5R>Rhxnpbk)Pf4IAdVmHUrpHiwG~PPHwl72ly42RQ
zP!nyk^*yLS|A`&&2>PSnXXX%=M=h{9w!??eY1DK~TwGqydt*A~?V2&8qNjD@fW|{3
zx=)E6J#Av#<cJ=lr^QCQT1B;L6%o}kBC4IMWt-@z_RXVOMn!pEN~~SBtt+ZSbep!G
zjKup(MZ2Di^IT8t?(rl|^|VhK5!x$ua_kfa7#q=TdbF$C=rOUAT&*HIL`Hc!E=cx^
z%zI}+n4e#y$M;%$Dh(Ib_4CY3uI(9_ytd{1?cT(B-o&g(moIg*H)n}=ZGo#Wcds`y
z&AWDw%eQKdH)Cy4N~$k$i!U+Fmzu@L7fmna=klbd^e_I|%oDt{fh~<%I+N1*r5`fa
z8_O03)GsW^@#Yn{d<j{e0jc9lM>@VY=6DiQoALZ&>N$SCxx5!Y{Z{lOu3js?@$=tc
z!|`-TbMvGi?Rn4H>_AFU=^>u`(i>Mu^(~v{`zvbCr1b4P3|lphpRca!>YrZVTbJ%j
zNb_7sZtyo27rgopKTmMx`;3-!wYKN?%u|$3zMlDLq~l$`%C{rSRg{uYl#t`}=;rdJ
zCHQuw7Us<SD|Pw4^;A;k-;VFENB<?Oo;_=}F;my9s-BryyYuc@`%%fj^nCAzCBF1M
zzVv*Tr{adXA%(fGsO(Eg@Fp(*Gf!PM#F4vg8~T*UyRj)<yS#MEtNg69^)x@f-&(}a
zFSdQ*>GVcG-tnCJC8+vxpXBH8ycmA2%j?3=D|yfJb5wq3ex~O?T)rsfuYLGAzdL(+
z;X+kU%=S<oPuQNpeEvHQX{vX3zEtk^Ui2#nzoYhCLDM^GnFZa;|JBpwxl-^8A3wkA
zqna+qw<^`Uakn=)&E?BTD@sW#E-hot$KM=6r#idiN*2w|`g<GdIko$QXW_omo`OB$
zJ&U(0Eu&~fwodfl-m21jf4E~|tM}IQ^gqzJM)BaQ=J}T9`%?CBO8!b<?|mQM(fzf3
zE>EZZ|DpR6`~P`I_ZA1b|DPl0O+OG)qKmn-fB)p=z46uzZRK5udJg7(zB11>cFdhe
z+iuRkUc3MIvEF#-CC}AEl^B2I;n33SXZkWyJp0nC|6A?7!>%CSG=IK`((^r8hnsj-
z<@xiu|MaZJ+mq=r_w93GE?!uLI}3d21#E3$UWUt?v%$Mr6<<PuZ^e>G&x|8o+dlF1
z_!dt*9XsAtl$6B9@~%&E6)j5BNw5u>oI!$Ine0vebN?LAuSZ;A|FxT^+0m)Ql6G`)
z&D(qL4C>L-<z2VgyI=|bSBx=no?gdh)9Ki;`dlgRvEB9ce*JURIeUHS2`+EqChoUy
z&7MEw-gCT1(7(KZ7r&#c^UFI!`Pu*7y`J*#6;^fz#gCaZaq5KFv92+(<Km{o=9N8h
zu(Y2m@92jY{5t4O&MTf5xJxhbRf~$2-th``vFFNOUWRX1HU~HVj>%7ceCLh6`SEm5
z+UX9S)2BP;1)nLeSIJ}Ns(D(Si!3hbMUru@FK>s!b8Ypo-e<4#^WbN>o}4soW&G!N
zyS;h&-r4zlFX)Uhnai6rv$&SEh|O~q%}Mgj&nlYFcSc5nZ&k9(z5;LOsW3OEFmI1{
z{t~{N7WtOVQPPT*r<k3;{WazIwx{_LIR^_9_%?7j0>0cWMJbEVH)>wEBZ;?6@tgF{
z!_7Fpd8v$gM{Ycw&o?3Papw#8S@%MZN`IY-;*axX7IC5N?eDD23uEb5`io5eNT+CS
zM$xPs&#By6G`Y`I&HMa|!Q8XF$S=$3y4`(g6qS@qk$(Pvz7{=)FT29Lc{BO?Wy7_?
zKVSH-C*J->$@}4Qpr2=bY7m3?U1|F7--qE>df03~eWga!v?=kiE^lhG1{*he($rWT
zdEe~Kz7-paQZoMcdh_zG1Sq<FSM}ztd~Jc}SbCr*<64bU_YE4>&9mp)Ej#nB>&+^r
L`ch}!j?4KUS6Ytz

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 36bf33d9..35aa7c51 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -1,3174 +1,3170 @@
-# Korean translation for Calibre-web
-# Copyright (C) 2022 EPUBGUIDE.NET
-# This file is distributed under the same license as the Calibre-web project
-# First korean translation by 내맘대로의 EPUBGUIDE.NET
-msgid ""
-msgstr ""
-"Project-Id-Version:  Calibre-web\n"
-"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2022-01-06 14:08+0100\n"
-"PO-Revision-Date: 2022-01-05 09:45+0900\n"
-"Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
-"Language: ko\n"
-"Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
-
-#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
-msgid "not installed"
-msgstr "설치되지 않음"
-
-#: cps/about.py:47 cps/about.py:63
-msgid "installed"
-msgstr "설치됨"
-
-#: cps/about.py:145
-msgid "Statistics"
-msgstr "통계"
-
-#: cps/admin.py:144
-msgid "Server restarted, please reload page"
-msgstr "서버를 다시 시작했습니다. 새로고침 해주세요."
-
-#: cps/admin.py:146
-msgid "Performing shutdown of server, please close window"
-msgstr "서버를 종료하는 중입니다. 창을 닫아주세요."
-
-#: cps/admin.py:154
-msgid "Reconnect successful"
-msgstr "재연결 성공"
-
-#: cps/admin.py:157
-msgid "Unknown command"
-msgstr "알 수 없는 명령"
-
-#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
-#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
-#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
-#: cps/uploader.py:103
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: cps/admin.py:188
-msgid "Admin page"
-msgstr "관리자 페이지"
-
-#: cps/admin.py:207
-msgid "Basic Configuration"
-msgstr "\"기본 설"
-
-#: cps/admin.py:244
-msgid "UI Configuration"
-msgstr "UI 설정"
-
-#: cps/admin.py:277 cps/templates/admin.html:50
-msgid "Edit Users"
-msgstr "사용자 관리"
-
-#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
-#: cps/templates/list.html:13
-msgid "All"
-msgstr "모두"
-
-#: cps/admin.py:343 cps/admin.py:1606
-msgid "User not found"
-msgstr "사용자를 찾을 수 없습니다."
-
-#: cps/admin.py:357
-msgid "{} users deleted successfully"
-msgstr "{} 사용자를 성공적으로 삭제하였습니다."
-
-#: cps/admin.py:379 cps/templates/config_view_edit.html:133
-#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
-msgid "Show All"
-msgstr "모두 보기"
-
-#: cps/admin.py:400 cps/admin.py:406
-msgid "Malformed request"
-msgstr "잘못된 요청"
-
-#: cps/admin.py:418 cps/admin.py:1484
-msgid "Guest Name can't be changed"
-msgstr "Guest 이름은 수정할 수 없습니다."
-
-#: cps/admin.py:430
-msgid "Guest can't have this role"
-msgstr "Guest는 이 권한을 사용할 수 없습니다."
-
-#: cps/admin.py:442 cps/admin.py:1442
-msgid "No admin user remaining, can't remove admin role"
-msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
-
-#: cps/admin.py:446 cps/admin.py:460
-msgid "Value has to be true or false"
-msgstr "true 또는 false만 사용할 수 있습니다."
-
-#: cps/admin.py:448
-msgid "Invalid role"
-msgstr "잘못된 권한"
-
-#: cps/admin.py:452
-msgid "Guest can't have this view"
-msgstr "Guest는 이 view를 사용할 수 없습니다."
-
-#: cps/admin.py:462
-msgid "Invalid view"
-msgstr "잘못된 view"
-
-#: cps/admin.py:465
-msgid "Guest's Locale is determined automatically and can't be set"
-msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없습니다. "
-
-#: cps/admin.py:469
-msgid "No Valid Locale Given"
-msgstr "유효한 로케일이 지정되지 않았습니다."
-
-#: cps/admin.py:480
-msgid "No Valid Book Language Given"
-msgstr "유효한 로케일이 지정되지 않았습니다."
-
-#: cps/admin.py:482
-msgid "Parameter not found"
-msgstr "매개변수를 찾을 수 없음 "
-
-#: cps/admin.py:533
-msgid "Invalid Read Column"
-msgstr "잘못된 읽기 열 "
-
-#: cps/admin.py:539
-msgid "Invalid Restricted Column"
-msgstr "잘못된 제한된 열 "
-
-#: cps/admin.py:560 cps/admin.py:1323
-msgid "Calibre-Web configuration updated"
-msgstr "Calibre-Web 설정이 업데이트 되었습니다."
-
-#: cps/admin.py:572
-msgid "Do you really want to delete the Kobo Token?"
-msgstr "Kobo Token을 삭제하시겠습니까?"
-
-#: cps/admin.py:574
-msgid "Do you really want to delete this domain?"
-msgstr "이 도메인을 삭제하시겠습니까?"
-
-#: cps/admin.py:576
-msgid "Do you really want to delete this user?"
-msgstr "이 사용자를 삭제하시겠습니까?"
-
-#: cps/admin.py:578
-msgid "Are you sure you want to delete this shelf?"
-msgstr "이 서재를 삭제하시겠습니까?"
-
-#: cps/admin.py:580
-msgid "Are you sure you want to change locales of selected user(s)?"
-msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
-
-#: cps/admin.py:582
-msgid "Are you sure you want to change visible book languages for selected user(s)?"
-msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까? "
-
-#: cps/admin.py:584
-msgid "Are you sure you want to change the selected role for the selected user(s)?"
-msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까? "
-
-#: cps/admin.py:586
-msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
-msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까? "
-
-#: cps/admin.py:588
-msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
-msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
-
-#: cps/admin.py:590
-msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
-msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까? "
-
-#: cps/admin.py:592
-msgid "Are you sure you want to change Calibre library location?"
-msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
-
-#: cps/admin.py:594
-msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
-
-#: cps/admin.py:743
-msgid "Tag not found"
-msgstr "태그를 찾을 수 없습니다."
-
-#: cps/admin.py:755
-msgid "Invalid Action"
-msgstr "잘못된 액션"
-
-#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
-#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
-#: cps/templates/user_table.html:58
-msgid "Deny"
-msgstr "거부됨"
-
-#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
-#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
-#: cps/templates/user_table.html:61
-msgid "Allow"
-msgstr "허용됨"
-
-#: cps/admin.py:913
-msgid "{} sync entries deleted"
-msgstr "{} 동기화 항목이 삭제되었습니다."
-
-#: cps/admin.py:1036
-msgid "client_secrets.json Is Not Configured For Web Application"
-msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않았습니다."
-
-#: cps/admin.py:1081
-msgid "Logfile Location is not Valid, Please Enter Correct Path"
-msgstr "로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1087
-msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
-msgstr "액세스 로그 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1117
-msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
-msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력하십시오."
-
-#: cps/admin.py:1123
-msgid "Please Enter a LDAP Service Account and Password"
-msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
-
-#: cps/admin.py:1126
-msgid "Please Enter a LDAP Service Account"
-msgstr "LDAP 서비스 계정을 입력하십시오"
-
-#: cps/admin.py:1131
-#, python-format
-msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
-
-#: cps/admin.py:1133
-msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있습니다."
-
-#: cps/admin.py:1137
-#, python-format
-msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
-
-#: cps/admin.py:1139
-msgid "LDAP User Object Filter Has Unmatched Parenthesis"
-msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있습니다."
-
-#: cps/admin.py:1146
-#, python-format
-msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
-msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자가 있어야 합니다."
-
-#: cps/admin.py:1148
-msgid "LDAP Member User Filter Has Unmatched Parenthesis"
-msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있습니다."
-
-#: cps/admin.py:1155
-msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
-msgstr "LDAP CACertificate, 인증서 또는 키 위치가 유효하지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
-#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:275 cps/shelf.py:337 cps/shelf.py:372 cps/shelf.py:447
-msgid "Settings DB is not Writeable"
-msgstr "설정 DB에 쓰기 권한이 없습니다."
-
-#: cps/admin.py:1208
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "DB 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1223
-msgid "DB is not Writeable"
-msgstr "쓰기 권한이 없는 DB"
-
-#: cps/admin.py:1235
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "키 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1239
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "인증서 파일 위치가 올바르지 않습니다. 올바른 경로를 입력하십시오."
-
-#: cps/admin.py:1346
-msgid "Database Settings updated"
-msgstr "데이터베이스 설정이 업데이트 되었습니다"
-
-#: cps/admin.py:1354
-msgid "Database Configuration"
-msgstr "데이터베이스 구성"
-
-#: cps/admin.py:1370 cps/web.py:1479
-msgid "Please fill out all fields!"
-msgstr "모든 필드를 채워주십시오!"
-
-#: cps/admin.py:1378
-msgid "E-mail is not from valid domain"
-msgstr "이메일이 유효한 도메인에서 온 것이 아닙니다."
-
-#: cps/admin.py:1384 cps/admin.py:1534
-msgid "Add new user"
-msgstr "새 사용자 추가"
-
-#: cps/admin.py:1395
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "사용자 '%(user)s'이(가) 생성됨"
-
-#: cps/admin.py:1401
-msgid "Found an existing account for this e-mail address or name."
-msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
-
-#: cps/admin.py:1421
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "사용자 '%(nick)s'이(가) 삭제되었습니다."
-
-#: cps/admin.py:1423 cps/admin.py:1424
-msgid "Can't delete Guest User"
-msgstr "게스트 사용자는 삭제할 수 없습니다"
-
-#: cps/admin.py:1427
-msgid "No admin user remaining, can't delete user"
-msgstr "관리자 계정이 하나 뿐입니다. 이 관리자 권한을 삭제할 수 없습니다."
-
-#: cps/admin.py:1500 cps/admin.py:1625
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "사용자 %(nick)s 편집"
-
-#: cps/admin.py:1504
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "사용자 '%(nick)s'가 업데이트 되었습니다."
-
-#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1504 cps/web.py:1564
-msgid "An unknown error occurred. Please try again later."
-msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
-
-#: cps/admin.py:1543 cps/templates/admin.html:98
-msgid "Edit E-mail Server Settings"
-msgstr "이메일 서버 설정 편집"
-
-#: cps/admin.py:1562
-msgid "Gmail Account Verification Successful"
-msgstr "Gmail 계정 인증 성공"
-
-#: cps/admin.py:1588
-#, python-format
-msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr "%(email)s에 보내기 위해 대기 중인 테스트 전자 메일입니다. 결과는 작업을 확인하십시오."
-
-#: cps/admin.py:1591
-#, python-format
-msgid "There was an error sending the Test e-mail: %(res)s"
-msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
-
-#: cps/admin.py:1593
-msgid "Please configure your e-mail address first..."
-msgstr "먼저 이메일 주소를 구성하십시오..."
-
-#: cps/admin.py:1595
-msgid "E-mail server settings updated"
-msgstr "이메일 서버 설정 업데이트됨"
-
-#: cps/admin.py:1637
-#, python-format
-msgid "Password for user %(user)s reset"
-msgstr "사용자 %(user)s의 비밀번호 재설정"
-
-#: cps/admin.py:1643 cps/web.py:1444
-msgid "Please configure the SMTP mail settings first..."
-msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
-
-#: cps/admin.py:1654
-msgid "Logfile viewer"
-msgstr "로그 파일 뷰어"
-
-#: cps/admin.py:1720
-msgid "Requesting update package"
-msgstr "업데이트 패키지 요청"
-
-#: cps/admin.py:1721
-msgid "Downloading update package"
-msgstr "업데이트 패키지 다운로드"
-
-#: cps/admin.py:1722
-msgid "Unzipping update package"
-msgstr "업데이트 패키지 압축 풀기"
-
-#: cps/admin.py:1723
-msgid "Replacing files"
-msgstr "파일 교체"
-
-#: cps/admin.py:1724
-msgid "Database connections are closed"
-msgstr "데이터베이스 연결이 닫힙니다."
-
-#: cps/admin.py:1725
-msgid "Stopping server"
-msgstr "서버 중지"
-
-#: cps/admin.py:1726
-msgid "Update finished, please press okay and reload page"
-msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요."
-
-#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
-#: cps/admin.py:1731 cps/admin.py:1732
-msgid "Update failed:"
-msgstr "업데이트 실패:"
-
-#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
-msgid "HTTP Error"
-msgstr "HTTP 오류"
-
-#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
-msgid "Connection error"
-msgstr "연결 오류"
-
-#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
-msgid "Timeout while establishing connection"
-msgstr "연결 설정 중 시간 초과"
-
-#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
-msgid "General error"
-msgstr "일반 오류"
-
-#: cps/admin.py:1731
-msgid "Update file could not be saved in temp dir"
-msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다."
-
-#: cps/admin.py:1732
-msgid "Files could not be replaced during update"
-msgstr "업데이트하는 동안 파일을 교체할 수 없습니다."
-
-#: cps/admin.py:1756
-msgid "Failed to extract at least One LDAP User"
-msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다."
-
-#: cps/admin.py:1801
-msgid "Failed to Create at Least One LDAP User"
-msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다."
-
-#: cps/admin.py:1814
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "오류: %(ldaperror)s"
-
-#: cps/admin.py:1818
-msgid "Error: No user returned in response of LDAP server"
-msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다."
-
-#: cps/admin.py:1851
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다."
-
-#: cps/admin.py:1853
-msgid "{} User Successfully Imported"
-msgstr "{} 사용자 가져오기 성공"
-
-#: cps/converter.py:30
-msgid "not configured"
-msgstr "구성되지 않음"
-
-#: cps/converter.py:32
-msgid "Execution permissions missing"
-msgstr "실행 권한 누락"
-
-#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
-#, python-format
-msgid "Custom Column No.%(column)d is not existing in calibre database"
-msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다."
-
-#: cps/editbooks.py:300 cps/editbooks.py:302
-msgid "Book Format Successfully Deleted"
-msgstr "책 형식이 성공적으로 삭제되었습니다."
-
-#: cps/editbooks.py:309 cps/editbooks.py:311
-msgid "Book Successfully Deleted"
-msgstr "책이 성공적으로 삭제되었습니다."
-
-#: cps/editbooks.py:361
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
-#: cps/web.py:1744 cps/web.py:1811
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다."
-
-#: cps/editbooks.py:410
-msgid "edit metadata"
-msgstr "메타데이터 편집"
-
-#: cps/editbooks.py:458
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다."
-
-#: cps/editbooks.py:494 cps/editbooks.py:958
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다."
-
-#: cps/editbooks.py:634 cps/editbooks.py:985
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다."
-
-#: cps/editbooks.py:638 cps/editbooks.py:989
-msgid "File to be uploaded must have an extension"
-msgstr "업로드할 파일에는 확장자가 있어야 합니다."
-
-#: cps/editbooks.py:650
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "%(file)s 파일을 저장하지 못했습니다."
-
-#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
-#, python-format
-msgid "Database error: %(error)s."
-msgstr "데이터베이스 오류: %(error)s."
-
-#: cps/editbooks.py:678
-#, python-format
-msgid "File format %(ext)s added to %(book)s"
-msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다."
-
-#: cps/editbooks.py:814
-msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
-msgstr "식별자는 대소문자를 구분하지 않으며 이전 식별자를 덮어씁니다."
-
-#: cps/editbooks.py:848
-msgid "Metadata successfully updated"
-msgstr "메타데이터가 성공적으로 업데이트되었습니다."
-
-#: cps/editbooks.py:861
-msgid "Error editing book, please check logfile for details"
-msgstr "책을 수정하는 동안 오류가 발생했습니다. 자세한 내용은 로그 파일을 확인하세요."
-
-#: cps/editbooks.py:899
-msgid "Uploaded book probably exists in the library, consider to change before upload new: "
-msgstr "업로드한 책이 라이브러리에 있을 수 있습니다. 새로 업로드하기 전에 변경하는 것이 좋습니다."
-
-#: cps/editbooks.py:997
-#, python-format
-msgid "File %(filename)s could not saved to temp dir"
-msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다."
-
-#: cps/editbooks.py:1016
-#, python-format
-msgid "Failed to Move Cover File %(file)s: %(error)s"
-msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
-
-#: cps/editbooks.py:1063
-#, python-format
-msgid "File %(file)s uploaded"
-msgstr "파일 %(file)s 업로드됨"
-
-#: cps/editbooks.py:1088
-msgid "Source or destination format for conversion missing"
-msgstr "변환을 위한 소스 또는 대상 형식이 누락되었습니다."
-
-#: cps/editbooks.py:1096
-#, python-format
-msgid "Book successfully queued for converting to %(book_format)s"
-msgstr "책이 %(book_format)s(으)로 변환하기 위해 대기 중입니다."
-
-#: cps/editbooks.py:1100
-#, python-format
-msgid "There was an error converting this book: %(res)s"
-msgstr "이 책을 변환하는 동안 오류가 발생했습니다: %(res)s"
-
-#: cps/gdrive.py:58
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드라이브를 비활성화했다가 다시 활성화해 보세요."
-
-#: cps/gdrive.py:95
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "콜백 도메인이 확인되지 않았습니다. 단계에 따라 Google 개발자 콘솔에서 도메인을 확인하세요."
-
-#: cps/helper.py:77
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
-
-#: cps/helper.py:83 cps/tasks/convert.py:73
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s을(를) Google 드라이브에서 찾을 수 없음: %(fn)s"
-
-#: cps/helper.py:88
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s을(를) 찾을 수 없음: %(fn)s"
-
-#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
-#: cps/templates/detail.html:45
-msgid "Send to Kindle"
-msgstr "킨들로 보내기"
-
-#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
-
-#: cps/helper.py:109
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web 테스트 이메일"
-
-#: cps/helper.py:110
-msgid "Test e-mail"
-msgstr "테스트 이메일"
-
-#: cps/helper.py:127
-msgid "Get Started with Calibre-Web"
-msgstr "Calibre-Web 시작하기"
-
-#: cps/helper.py:132
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "사용자 등록 이메일: %(name)s"
-
-#: cps/helper.py:143 cps/helper.py:149
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr "%(orig)s를 %(format)s로 변환하고 킨들로 보내기"
-
-#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr "킨들에 %(format)s 보내기"
-
-#: cps/helper.py:216 cps/tasks/convert.py:90
-#, python-format
-msgid "%(book)s send to Kindle"
-msgstr "%(book)s을 킨들로 보내기"
-
-#: cps/helper.py:221
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "요청한 파일을 읽을 수 없습니다. 권한이 잘못되었을 수 있습니다."
-
-#: cps/helper.py:313
-#, python-format
-msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr "책 %(id)s에 대한 책 폴더를 삭제하지 못했습니다. 경로에 하위 폴더가 있습니다: %(path)s"
-
-#: cps/helper.py:319
-#, python-format
-msgid "Deleting book %(id)s failed: %(message)s"
-msgstr "%(id)s 도서 삭제 실패: %(message)s"
-
-#: cps/helper.py:330
-#, python-format
-msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
-msgstr "데이터베이스에서만 책 %(id)s 을(를) 삭제 중, 데이터베이스의 책 경로가 유효하지 않음: %(path)s"
-
-#: cps/helper.py:385
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "제목 이름을 '%(src)s'에서 '%(dest)s'(으)로 변경하지 못했습니다. 오류: %(error)s"
-
-#: cps/helper.py:400
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "'%(src)s' 경로의 파일 이름을 '%(dest)s'(으)로 변경하지 못했습니다. 오류: %(error)s"
-
-#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "Google 드라이브에서 %(file)s 파일을 찾을 수 없습니다."
-
-#: cps/helper.py:464
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다."
-
-#: cps/helper.py:504 cps/web.py:1659
-msgid "Found an existing account for this e-mail address"
-msgstr "등록되어 있는 이메일 주소입니다."
-
-#: cps/helper.py:512
-msgid "This username is already taken"
-msgstr "등록되어 있는 username입니다."
-
-#: cps/helper.py:522
-msgid "Invalid e-mail address format"
-msgstr "이메일 주소 형식이 잘못되었습니다."
-
-#: cps/helper.py:595
-msgid "Error Downloading Cover"
-msgstr "표지 다운로드 중 오류 발생"
-
-#: cps/helper.py:598
-msgid "Cover Format Error"
-msgstr "표지 형식 오류"
-
-#: cps/helper.py:608
-msgid "Failed to create path for cover"
-msgstr "표지 경로 생성 실패"
-
-#: cps/helper.py:624
-msgid "Cover-file is not a valid image file, or could not be stored"
-msgstr "표지 파일이 유효한 이미지 파일이 아니거나 저장할 수 없습니다."
-
-#: cps/helper.py:635
-msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr "jpg/jpeg/png/webp/bmp 파일만 표지 파일로 지원됩니다."
-
-#: cps/helper.py:648
-msgid "Invalid cover file content"
-msgstr "잘못된 표지 파일 콘텐츠"
-
-#: cps/helper.py:652
-msgid "Only jpg/jpeg files are supported as coverfile"
-msgstr "jpg/jpeg 파일만 표지 파일로 지원됩니다."
-
-#: cps/helper.py:704
-msgid "Unrar binary file not found"
-msgstr "Unrar 바이너리 파일을 찾을 수 없습니다."
-
-#: cps/helper.py:715
-msgid "Error excecuting UnRar"
-msgstr "UnRar 실행 오류"
-
-#: cps/helper.py:763
-msgid "Waiting"
-msgstr "대기중"
-
-#: cps/helper.py:765
-msgid "Failed"
-msgstr "실패"
-
-#: cps/helper.py:767
-msgid "Started"
-msgstr "시작됨"
-
-#: cps/helper.py:769
-msgid "Finished"
-msgstr "종료"
-
-#: cps/helper.py:771
-msgid "Unknown Status"
-msgstr "알 수 없는 상태"
-
-#: cps/kobo_auth.py:127
-msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
-msgstr "kobo 장치에 대한 유효한 api_endpoint를 얻으려면 로컬 호스트가 아닌 곳에서 calibre-web에 액세스하십시오."
-
-#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
-msgid "Kobo Setup"
-msgstr "Kobo 설정"
-
-#: cps/oauth_bb.py:77
-#, python-format
-msgid "Register with %(provider)s"
-msgstr "%(provider)s에 등록"
-
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
-
-#: cps/oauth_bb.py:148
-#, python-format
-msgid "Link to %(oauth)s Succeeded"
-msgstr "%(oauth)s에 성공적으로 연결됨"
-
-#: cps/oauth_bb.py:155
-msgid "Login failed, No User Linked With OAuth Account"
-msgstr "로그인 실패, OAuth 계정과 연결된 사용자 없음"
-
-#: cps/oauth_bb.py:197
-#, python-format
-msgid "Unlink to %(oauth)s Succeeded"
-msgstr "%(oauth)s에 연결 해제 성공"
-
-#: cps/oauth_bb.py:202
-#, python-format
-msgid "Unlink to %(oauth)s Failed"
-msgstr "%(oauth)s에 연결 해제 실패"
-
-#: cps/oauth_bb.py:205
-#, python-format
-msgid "Not Linked to %(oauth)s"
-msgstr "%(oauth)s에 연결되지 않음"
-
-#: cps/oauth_bb.py:261
-msgid "Failed to log in with GitHub."
-msgstr "GitHub에 로그인하지 못했습니다."
-
-#: cps/oauth_bb.py:267
-msgid "Failed to fetch user info from GitHub."
-msgstr "GitHub에서 사용자 정보를 가져오지 못했습니다."
-
-#: cps/oauth_bb.py:279
-msgid "Failed to log in with Google."
-msgstr "구글 로그인에 실패했습니다."
-
-#: cps/oauth_bb.py:285
-msgid "Failed to fetch user info from Google."
-msgstr "Google에서 사용자 정보를 가져오지 못했습니다."
-
-#: cps/oauth_bb.py:332
-msgid "GitHub Oauth error, please retry later."
-msgstr "GitHub Oauth 오류입니다. 나중에 다시 시도하세요."
-
-#: cps/oauth_bb.py:335
-msgid "GitHub Oauth error: {}"
-msgstr "GitHub 인증 오류: {}"
-
-#: cps/oauth_bb.py:356
-msgid "Google Oauth error, please retry later."
-msgstr "Google 인증 오류입니다. 나중에 다시 시도하세요."
-
-#: cps/oauth_bb.py:359
-msgid "Google Oauth error: {}"
-msgstr "Google 인증 오류: {}"
-
-#: cps/opds.py:384
-msgid "{} Stars"
-msgstr "{} Stars"
-
-#: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
-msgid "Login"
-msgstr "로그인"
-
-#: cps/remotelogin.py:77 cps/remotelogin.py:111
-msgid "Token not found"
-msgstr "토큰을 찾을 수 없습니다."
-
-#: cps/remotelogin.py:86 cps/remotelogin.py:119
-msgid "Token has expired"
-msgstr "토큰이 만료되었습니다."
-
-#: cps/remotelogin.py:95
-msgid "Success! Please return to your device"
-msgstr "성공! 기기로 돌아가주세요."
-
-#: cps/render_template.py:39 cps/web.py:416
-msgid "Books"
-msgstr "책"
-
-#: cps/render_template.py:41
-msgid "Show recent books"
-msgstr "최근 책 보기"
-
-#: cps/render_template.py:42 cps/templates/index.xml:25
-msgid "Hot Books"
-msgstr "인기있는 책"
-
-#: cps/render_template.py:44
-msgid "Show Hot Books"
-msgstr "주목받는 책 보기"
-
-#: cps/render_template.py:46 cps/render_template.py:51
-msgid "Downloaded Books"
-msgstr "다운로드된 책"
-
-#: cps/render_template.py:48 cps/render_template.py:53
-#: cps/templates/user_table.html:167
-msgid "Show Downloaded Books"
-msgstr "다운로드된 책 보기"
-
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
-msgid "Top Rated Books"
-msgstr "평점이 높은 책"
-
-#: cps/render_template.py:58 cps/templates/user_table.html:161
-msgid "Show Top Rated Books"
-msgstr "평점이 높은 책 보기"
-
-#: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:676
-msgid "Read Books"
-msgstr "읽은 책"
-
-#: cps/render_template.py:61
-msgid "Show read and unread"
-msgstr "읽은 책과 읽지 않은 책 보기"
-
-#: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:679
-msgid "Unread Books"
-msgstr "읽지 않은 책"
-
-#: cps/render_template.py:65
-msgid "Show unread"
-msgstr "읽지 않은 책 보기"
-
-#: cps/render_template.py:66
-msgid "Discover"
-msgstr "발견"
-
-#: cps/render_template.py:68 cps/templates/index.xml:50
-#: cps/templates/user_table.html:162
-msgid "Show Random Books"
-msgstr "무작위 추천"
-
-#: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1041
-msgid "Categories"
-msgstr "카테고리"
-
-#: cps/render_template.py:71 cps/templates/user_table.html:158
-msgid "Show category selection"
-msgstr "카테고리별 보기"
-
-#: cps/render_template.py:72 cps/templates/book_edit.html:90
-#: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
-msgid "Series"
-msgstr "시리즈"
-
-#: cps/render_template.py:74 cps/templates/user_table.html:157
-msgid "Show series selection"
-msgstr "시리즈별 보기"
-
-#: cps/render_template.py:75 cps/templates/book_table.html:66
-#: cps/templates/index.xml:69
-msgid "Authors"
-msgstr "저자"
-
-#: cps/render_template.py:77 cps/templates/user_table.html:160
-msgid "Show author selection"
-msgstr "저자별 보기"
-
-#: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:925
-msgid "Publishers"
-msgstr "출판사"
-
-#: cps/render_template.py:81 cps/templates/user_table.html:163
-msgid "Show publisher selection"
-msgstr "출판사별 보기"
-
-#: cps/render_template.py:82 cps/templates/book_table.html:70
-#: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1018
-msgid "Languages"
-msgstr "언어"
-
-#: cps/render_template.py:85 cps/templates/user_table.html:155
-msgid "Show language selection"
-msgstr "언어별 보기"
-
-#: cps/render_template.py:86 cps/templates/index.xml:104
-msgid "Ratings"
-msgstr "평점"
-
-#: cps/render_template.py:88 cps/templates/user_table.html:164
-msgid "Show ratings selection"
-msgstr "평점별 보기"
-
-#: cps/render_template.py:89 cps/templates/index.xml:112
-msgid "File formats"
-msgstr "파일 유형"
-
-#: cps/render_template.py:91 cps/templates/user_table.html:165
-msgid "Show file formats selection"
-msgstr "파일 유형별 보기"
-
-#: cps/render_template.py:93 cps/web.py:703
-msgid "Archived Books"
-msgstr "보관된 책"
-
-#: cps/render_template.py:95 cps/templates/user_table.html:166
-msgid "Show archived books"
-msgstr "보관된 책 보기"
-
-#: cps/render_template.py:97 cps/web.py:780
-msgid "Books List"
-msgstr "책 목록"
-
-#: cps/render_template.py:99 cps/templates/user_table.html:168
-msgid "Show Books List"
-msgstr "책 목록 보기"
-
-#: cps/shelf.py:67 cps/shelf.py:121
-msgid "Invalid shelf specified"
-msgstr "잘못된 책장 지정"
-
-#: cps/shelf.py:73
-msgid "Sorry you are not allowed to add a book to that shelf"
-msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다."
-
-#: cps/shelf.py:82
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
-
-#: cps/shelf.py:107
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "책장에 책이 등록됨: %(sname)s"
-
-#: cps/shelf.py:126
-msgid "You are not allowed to add a book to the shelf"
-msgstr "책장에 책을 추가할 권한이 없습니다."
-
-#: cps/shelf.py:144
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "책장에 이미 책이 등록됨:  %(name)s"
-
-#: cps/shelf.py:156
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "책이 책장에 등록됨: %(sname)s"
-
-#: cps/shelf.py:163
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "책장에 책을 추가할 수 없음: %(sname)s"
-
-#: cps/shelf.py:209
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "책이 책장에서 삭제됨: %(sname)s"
-
-#: cps/shelf.py:218
-msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다."
-
-#: cps/shelf.py:228 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "책장 추가"
-
-#: cps/shelf.py:237
-msgid "Sorry you are not allowed to edit this shelf"
-msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다."
-
-#: cps/shelf.py:239
-msgid "Edit a shelf"
-msgstr "책장 편집"
-
-#: cps/shelf.py:249
-msgid "Sorry you are not allowed to create a public shelf"
-msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다."
-
-#: cps/shelf.py:262
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "%(title)s 책장이 추가됨"
-
-#: cps/shelf.py:265
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "%(title)s 책장이 변경됨"
-
-#: cps/shelf.py:279
-msgid "There was an error"
-msgstr "오류가 발생하였습니다."
-
-#: cps/shelf.py:301
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
-
-#: cps/shelf.py:312
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
-
-#: cps/shelf.py:333
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "책이 성공적으로 삭제되었습니다."
-
-#: cps/shelf.py:382
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "책장 순서 변경: '%(name)s'"
-
-#: cps/shelf.py:452
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "책장: '%(name)s'"
-
-#: cps/shelf.py:456
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
-
-#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
-msgid "Unexpected data while reading update information"
-msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
-
-#: cps/updater.py:410 cps/updater.py:521
-msgid "No update available. You already have the latest version installed"
-msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다."
-
-#: cps/updater.py:428
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
-
-#: cps/updater.py:446
-msgid "Could not fetch update information"
-msgstr "업데이트 정보를 가져올 수 없습니다"
-
-#: cps/updater.py:456
-msgid "Click on the button below to update to the latest stable version."
-msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
-
-#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr "최신 안정 버전 %(version)s으로 업데이트하려면 아래 버튼을 클릭하세요."
-
-#: cps/updater.py:507
-msgid "No release information available"
-msgstr "출시 정보가 없습니다"
-
-#: cps/templates/index.html:5 cps/web.py:440
-msgid "Discover (Random Books)"
-msgstr "발견(무작위 도서)"
-
-#: cps/web.py:471
-msgid "Hot Books (Most Downloaded)"
-msgstr "인기있는 책(가장 많이 다운로드됨)"
-
-#: cps/web.py:507
-#, python-format
-msgid "Downloaded books by %(user)s"
-msgstr "%(user)s이(가) 다운로드한 책"
-
-#: cps/web.py:539
-#, python-format
-msgid "Author: %(name)s"
-msgstr "저자: %(name)s"
-
-#: cps/web.py:554
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "출판사: %(name)s"
-
-#: cps/web.py:569
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "시리즈: %(serie)s"
-
-#: cps/web.py:582
-#, python-format
-msgid "Rating: %(rating)s stars"
-msgstr "평가: %(rating)s 별"
-
-#: cps/web.py:597
-#, python-format
-msgid "File format: %(format)s"
-msgstr "파일 유형: %(format)s"
-
-#: cps/web.py:615
-#, python-format
-msgid "Category: %(name)s"
-msgstr "카테고리: %(name)s"
-
-#: cps/web.py:631
-#, python-format
-msgid "Language: %(name)s"
-msgstr "언어: %(name)s"
-
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
-msgid "Advanced Search"
-msgstr "상세 검색"
-
-#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
-#: cps/templates/index.xml:11 cps/templates/layout.html:45
-#: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1077
-msgid "Search"
-msgstr "검색"
-
-#: cps/templates/admin.html:16 cps/web.py:903
-msgid "Downloads"
-msgstr "다운로드"
-
-#: cps/web.py:980
-msgid "Ratings list"
-msgstr "평점 목록"
-
-#: cps/web.py:1001
-msgid "File formats list"
-msgstr "파일 유형 목록"
-
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
-msgid "Tasks"
-msgstr "작업"
-
-#: cps/web.py:1215
-msgid "Published after "
-msgstr "Published after"
-
-#: cps/web.py:1222
-msgid "Published before "
-msgstr "Published before"
-
-#: cps/web.py:1244
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "평점 <= %(rating)s"
-
-#: cps/web.py:1246
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "평점 >= %(rating)s"
-
-#: cps/web.py:1248
-#, python-format
-msgid "Read Status = %(status)s"
-msgstr "읽은 상태 = %(status)s"
-
-#: cps/web.py:1353
-msgid "Error on search for custom columns, please restart Calibre-Web"
-msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오."
-
-#: cps/web.py:1449
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다."
-
-#: cps/web.py:1453
-#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
-msgstr "책을 보내는 중에 오류 발생: %(res)s"
-
-#: cps/web.py:1455
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
-msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
-
-#: cps/web.py:1472
-msgid "E-Mail server is not configured, please contact your administrator!"
-msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
-
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
-#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
-#: cps/web.py:1515
-msgid "Register"
-msgstr "등록"
-
-#: cps/web.py:1507
-msgid "Your e-mail is not allowed to register"
-msgstr "이메일을 등록할 수 없습니다."
-
-#: cps/web.py:1510
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "확인을 위한 이메일이 발송되었습니다."
-
-#: cps/web.py:1524
-msgid "Cannot activate LDAP authentication"
-msgstr "LDAP 인증을 활성화할 수 없습니다."
-
-#: cps/web.py:1543
-#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
-msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
-
-#: cps/web.py:1549
-#, python-format
-msgid "Could not login: %(message)s"
-msgstr "로그인 실패: %(message)s"
-
-#: cps/web.py:1553 cps/web.py:1578
-msgid "Wrong Username or Password"
-msgstr "잘못된 사용자명 또는 비밀번호"
-
-#: cps/web.py:1560
-msgid "New Password was send to your email address"
-msgstr "새 비밀번호가 이메일로 전송되었습니다."
-
-#: cps/web.py:1566
-msgid "Please enter valid username to reset password"
-msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오."
-
-#: cps/web.py:1573
-#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
-msgstr "로그인을 할 수 없음: '%(nickname)s"
-
-#: cps/web.py:1639 cps/web.py:1688
-#, python-format
-msgid "%(name)s's profile"
-msgstr "%(name)s 프로필"
-
-#: cps/web.py:1655
-msgid "Profile updated"
-msgstr "프로필이 업데이트 됨"
-
-#: cps/services/gmail.py:58
-msgid "Found no valid gmail.json file with OAuth information"
-msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다."
-
-#: cps/tasks/convert.py:137
-#, python-format
-msgid "Calibre ebook-convert %(tool)s not found"
-msgstr "Calibre ebook-convert %(tool)s을(를) 찾을 수 없습니다."
-
-#: cps/tasks/convert.py:163
-#, python-format
-msgid "%(format)s format not found on disk"
-msgstr "%(format)s 형식을 찾을 수 없습니다."
-
-#: cps/tasks/convert.py:167
-msgid "Ebook converter failed with unknown error"
-msgstr "알 수 없는 오류로 인해 전자책 변환이 실패했습니다."
-
-#: cps/tasks/convert.py:177
-#, python-format
-msgid "Kepubify-converter failed: %(error)s"
-msgstr "Kepubify 변환 실패: %(error)s"
-
-#: cps/tasks/convert.py:199
-#, python-format
-msgid "Converted file not found or more than one file in folder %(folder)s"
-msgstr "변환된 파일을 찾을 수 없거나 %(folder)s 폴더에 하나 이상의 파일이 존재합니다."
-
-#: cps/tasks/convert.py:222
-#, python-format
-msgid "Ebook-converter failed: %(error)s"
-msgstr "\"전자책 변환 실패: %(error)s"
-
-#: cps/tasks/convert.py:245
-#, python-format
-msgid "Calibre failed with error: %(error)s"
-msgstr "오류로 인한 Calibre 실패: %(error)s"
-
-#: cps/templates/admin.html:9
-msgid "Users"
-msgstr "사용자"
-
-#: cps/templates/admin.html:13 cps/templates/login.html:9
-#: cps/templates/login.html:10 cps/templates/register.html:9
-#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
-msgid "Username"
-msgstr "사용자명"
-
-#: cps/templates/admin.html:14 cps/templates/register.html:14
-#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
-msgstr "이메일 주소"
-
-#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to Kindle E-mail Address"
-msgstr "킨들로 보내기 이메일 주소"
-
-#: cps/templates/admin.html:17 cps/templates/layout.html:76
-#: cps/templates/user_table.html:143
-msgid "Admin"
-msgstr "관리자"
-
-#: cps/templates/admin.html:18 cps/templates/login.html:13
-#: cps/templates/login.html:14 cps/templates/user_edit.html:23
-msgid "Password"
-msgstr "비밀번호"
-
-#: cps/templates/admin.html:20 cps/templates/layout.html:66
-#: cps/templates/user_table.html:145
-msgid "Upload"
-msgstr "업로드"
-
-#: cps/templates/admin.html:22 cps/templates/detail.html:18
-#: cps/templates/detail.html:27 cps/templates/shelf.html:7
-#: cps/templates/user_table.html:146
-msgid "Download"
-msgstr "다운로드"
-
-#: cps/templates/admin.html:23
-msgid "View Books"
-msgstr "책 보기"
-
-#: cps/templates/admin.html:24 cps/templates/user_table.html:131
-#: cps/templates/user_table.html:148
-msgid "Edit"
-msgstr "편집"
-
-#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
-#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
-#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
-#: cps/templates/user_table.html:149
-msgid "Delete"
-msgstr "삭제"
-
-#: cps/templates/admin.html:26
-msgid "Public Shelf"
-msgstr "공개 책장"
-
-#: cps/templates/admin.html:51
-msgid "Add New User"
-msgstr "사용자 추가"
-
-#: cps/templates/admin.html:53
-msgid "Import LDAP Users"
-msgstr "LDAP 사용자 가져오기"
-
-#: cps/templates/admin.html:60
-msgid "E-mail Server Settings"
-msgstr "이메일 서버 설정"
-
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
-msgid "SMTP Hostname"
-msgstr "SMTP Hostname"
-
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
-msgid "SMTP Port"
-msgstr "SMTP Port"
-
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
-msgid "Encryption"
-msgstr "암호화"
-
-#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
-msgid "SMTP Login"
-msgstr "SMTP Login"
-
-#: cps/templates/admin.html:81 cps/templates/admin.html:92
-#: cps/templates/email_edit.html:55
-msgid "From E-mail"
-msgstr "From E-mail"
-
-#: cps/templates/admin.html:88
-msgid "E-Mail Service"
-msgstr "E-Mail Service"
-
-#: cps/templates/admin.html:89
-msgid "Gmail via Oauth2"
-msgstr "Gmail via Oauth2"
-
-#: cps/templates/admin.html:104
-msgid "Configuration"
-msgstr "환경 설정"
-
-#: cps/templates/admin.html:107
-msgid "Calibre Database Directory"
-msgstr "Calibre DB 폴더"
-
-#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
-msgid "Log Level"
-msgstr "Log Level"
-
-#: cps/templates/admin.html:115
-msgid "Port"
-msgstr "Port"
-
-#: cps/templates/admin.html:120
-msgid "External Port"
-msgstr "External Port"
-
-#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
-msgid "Books per Page"
-msgstr "페이지당 보여 줄 책 수"
-
-#: cps/templates/admin.html:131
-msgid "Uploads"
-msgstr "업로드"
-
-#: cps/templates/admin.html:135
-msgid "Anonymous Browsing"
-msgstr "익명 보기"
-
-#: cps/templates/admin.html:139
-msgid "Public Registration"
-msgstr "공개 등록"
-
-#: cps/templates/admin.html:143
-msgid "Magic Link Remote Login"
-msgstr "Magic Link Remote Login"
-
-#: cps/templates/admin.html:147
-msgid "Reverse Proxy Login"
-msgstr "Reverse Proxy Login"
-
-#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
-msgid "Reverse Proxy Header Name"
-msgstr "Reverse Proxy Header Name"
-
-#: cps/templates/admin.html:157
-msgid "Edit Calibre Database Configuration"
-msgstr "Calibre Database 환경 설정 편집"
-
-#: cps/templates/admin.html:158
-msgid "Edit Basic Configuration"
-msgstr "기본 환경 설정 편집"
-
-#: cps/templates/admin.html:159
-msgid "Edit UI Configuration"
-msgstr "UI 환경 설정 편집"
-
-#: cps/templates/admin.html:164
-msgid "Administration"
-msgstr "관리"
-
-#: cps/templates/admin.html:165
-msgid "Download Debug Package"
-msgstr "Debug Package 다운로드"
-
-#: cps/templates/admin.html:166
-msgid "View Logs"
-msgstr "로그 보기"
-
-#: cps/templates/admin.html:169
-msgid "Reconnect Calibre Database"
-msgstr "Calibre DB 다시 연결"
-
-#: cps/templates/admin.html:170
-msgid "Restart"
-msgstr "재시작"
-
-#: cps/templates/admin.html:171
-msgid "Shutdown"
-msgstr "종료"
-
-#: cps/templates/admin.html:176
-msgid "Update"
-msgstr "업데이트"
-
-#: cps/templates/admin.html:180
-msgid "Version"
-msgstr "버전"
-
-#: cps/templates/admin.html:181
-msgid "Details"
-msgstr "세부 정보"
-
-#: cps/templates/admin.html:187
-msgid "Current version"
-msgstr "현재 버전"
-
-#: cps/templates/admin.html:194
-msgid "Check for Update"
-msgstr "업데이트 확인"
-
-#: cps/templates/admin.html:195
-msgid "Perform Update"
-msgstr "업데이트 실행"
-
-#: cps/templates/admin.html:208
-msgid "Are you sure you want to restart?"
-msgstr "재시작을 하시겠습니까?"
-
-#: cps/templates/admin.html:213 cps/templates/admin.html:227
-#: cps/templates/admin.html:247 cps/templates/config_db.html:70
-msgid "OK"
-msgstr "예"
-
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
-#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
-#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
-#: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
-#: cps/templates/user_edit.html:144
-msgid "Cancel"
-msgstr "취소"
-
-#: cps/templates/admin.html:226
-msgid "Are you sure you want to shutdown?"
-msgstr "종료를 하시겠습니까?"
-
-#: cps/templates/admin.html:238
-msgid "Updating, please do not reload this page"
-msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
-
-#: cps/templates/author.html:15
-msgid "via"
-msgstr "via"
-
-#: cps/templates/author.html:23
-msgid "In Library"
-msgstr "In Library"
-
-#: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:19
-msgid "Sort according to book date, newest first"
-msgstr "책 목록 정렬, 최신순"
-
-#: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:20
-msgid "Sort according to book date, oldest first"
-msgstr "책 목록 정렬, 오래된 순"
-
-#: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:21
-msgid "Sort title in alphabetical order"
-msgstr "가나다 순 정렬"
-
-#: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:22
-msgid "Sort title in reverse alphabetical order"
-msgstr "가나다 역순 정렬"
-
-#: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:25
-msgid "Sort according to publishing date, newest first"
-msgstr "발행일 순으로 정렬, 최신순"
-
-#: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:26
-msgid "Sort according to publishing date, oldest first"
-msgstr "발행일 순으로 정렬, 오래된 순"
-
-#: cps/templates/author.html:57 cps/templates/author.html:117
-#: cps/templates/discover.html:30 cps/templates/index.html:29
-#: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:54
-msgid "reduce"
-msgstr "reduce"
-
-#: cps/templates/author.html:101
-msgid "More by"
-msgstr "More by"
-
-#: cps/templates/book_edit.html:10
-msgid "Delete Book"
-msgstr "책 삭제"
-
-#: cps/templates/book_edit.html:13
-msgid "Delete formats:"
-msgstr "유형 삭제"
-
-#: cps/templates/book_edit.html:24
-msgid "Convert book format:"
-msgstr "책 유형 변경"
-
-#: cps/templates/book_edit.html:29
-msgid "Convert from:"
-msgstr "변경전 유형:"
-
-#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
-msgid "select an option"
-msgstr "옵션 선택"
-
-#: cps/templates/book_edit.html:36
-msgid "Convert to:"
-msgstr "변경후 유형:"
-
-#: cps/templates/book_edit.html:45
-msgid "Convert book"
-msgstr "책 변경"
-
-#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
-msgid "Book Title"
-msgstr "책 제목"
-
-#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
-#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
-msgid "Author"
-msgstr "저자"
-
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
-#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
-msgid "Description"
-msgstr "책 소개"
-
-#: cps/templates/book_edit.html:72
-msgid "Identifiers"
-msgstr "식별자"
-
-#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
-msgid "Identifier Type"
-msgstr "식별자 유형"
-
-#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
-msgid "Identifier Value"
-msgstr "식별자 값"
-
-#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
-#: cps/templates/user_table.html:24
-msgid "Remove"
-msgstr "삭제"
-
-#: cps/templates/book_edit.html:82
-msgid "Add Identifier"
-msgstr "식별자 추가"
-
-#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
-msgid "Tags"
-msgstr "태그"
-
-#: cps/templates/book_edit.html:94
-msgid "Series ID"
-msgstr "시리즈 ID"
-
-#: cps/templates/book_edit.html:98
-msgid "Rating"
-msgstr "평점"
-
-#: cps/templates/book_edit.html:103
-msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
-msgstr "URL로 표지 추가(JPEG - 이미지를 다운로드 하여 DB에 저장합니다)"
-
-#: cps/templates/book_edit.html:107
-msgid "Upload Cover from Local Disk"
-msgstr "로컬 디스크에서 표지 업로드"
-
-#: cps/templates/book_edit.html:112
-msgid "Published Date"
-msgstr "출간일"
-
-#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
-#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
-#: cps/templates/search_form.html:16
-msgid "Publisher"
-msgstr "출판사"
-
-#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
-#: cps/templates/user_edit.html:33
-msgid "Language"
-msgstr "언어"
-
-#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
-#: cps/templates/search_form.html:164
-msgid "Yes"
-msgstr "예"
-
-#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
-#: cps/templates/search_form.html:165
-msgid "No"
-msgstr "아니오"
-
-#: cps/templates/book_edit.html:200
-msgid "Upload Format"
-msgstr "업로드 유형"
-
-#: cps/templates/book_edit.html:208
-msgid "View Book on Save"
-msgstr "저장 후 책 보기"
-
-#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
-msgid "Fetch Metadata"
-msgstr "메타정보 가져오기"
-
-#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
-#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
-#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
-msgid "Save"
-msgstr "저장"
-
-#: cps/templates/book_edit.html:232
-msgid "Keyword"
-msgstr "키워드"
-
-#: cps/templates/book_edit.html:233
-msgid "Search keyword"
-msgstr "키워드 검색"
-
-#: cps/templates/book_edit.html:239
-msgid "Click the cover to load metadata to the form"
-msgstr "표지를 클릭하여 양식에 메타데이터 로드"
-
-#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
-msgid "Loading..."
-msgstr "불러오는 중..."
-
-#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
-#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
-#: cps/templates/user_edit.html:163
-msgid "Close"
-msgstr "닫기"
-
-#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
-msgid "Source"
-msgstr "출처"
-
-#: cps/templates/book_edit.html:286
-msgid "Search error!"
-msgstr "오류 검색!"
-
-#: cps/templates/book_edit.html:287
-msgid "No Result(s) found! Please try another keyword."
-msgstr "검색 결과가 없습니다! 다른 키워드를 시도하십시오."
-
-#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
-#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
-#: cps/templates/user_table.html:100
-msgid "This Field is Required"
-msgstr "이 필드는 필수 항목입니다."
-
-#: cps/templates/book_table.html:37
-msgid "Merge selected books"
-msgstr "선택한 책 병합"
-
-#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
-msgid "Remove Selections"
-msgstr "선택 제거"
-
-#: cps/templates/book_table.html:41
-msgid "Exchange author and title"
-msgstr "저자 및 제목 교환"
-
-#: cps/templates/book_table.html:47
-msgid "Update Title Sort automatically"
-msgstr "자동으로 제목 정렬 업데이트"
-
-#: cps/templates/book_table.html:51
-msgid "Update Author Sort automatically"
-msgstr "자동으로 작성자 정렬 업데이트"
-
-#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
-msgid "Enter Title"
-msgstr "제목 입력"
-
-#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
-#: cps/templates/shelf_edit.html:8
-msgid "Title"
-msgstr "제목"
-
-#: cps/templates/book_table.html:64
-msgid "Enter Title Sort"
-msgstr "제목 정렬 입력"
-
-#: cps/templates/book_table.html:64
-msgid "Title Sort"
-msgstr "제목 정렬"
-
-#: cps/templates/book_table.html:65
-msgid "Enter Author Sort"
-msgstr "저자 정렬 입력"
-
-#: cps/templates/book_table.html:65
-msgid "Author Sort"
-msgstr "저자 정렬"
-
-#: cps/templates/book_table.html:66
-msgid "Enter Authors"
-msgstr "저자 입력"
-
-#: cps/templates/book_table.html:67
-msgid "Enter Categories"
-msgstr "카테고리 입력"
-
-#: cps/templates/book_table.html:68
-msgid "Enter Series"
-msgstr "시리즈 입력"
-
-#: cps/templates/book_table.html:69
-msgid "Series Index"
-msgstr "시리즈 색인"
-
-#: cps/templates/book_table.html:70
-msgid "Enter Languages"
-msgstr "언어 입력"
-
-#: cps/templates/book_table.html:71
-msgid "Publishing Date"
-msgstr "출간일"
-
-#: cps/templates/book_table.html:72
-msgid "Enter Publishers"
-msgstr "출판사 입력"
-
-#: cps/templates/book_table.html:73
-msgid "Enter comments"
-msgstr "코멘트 입력"
-
-#: cps/templates/book_table.html:73
-msgid "Comments"
-msgstr "코멘트"
-
-#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
-#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
-#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
-#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
-msgid "Enter "
-msgstr "입력"
-
-#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
-msgid "Are you really sure?"
-msgstr "정말 확신합니까?"
-
-#: cps/templates/book_table.html:114
-msgid "Books with Title will be merged from:"
-msgstr "제목이 있는 책은 다음에서 병합됩니다."
-
-#: cps/templates/book_table.html:118
-msgid "Into Book with Title:"
-msgstr "제목이 있는 책으로:"
-
-#: cps/templates/book_table.html:123
-msgid "Merge"
-msgstr "병합"
-
-#: cps/templates/config_db.html:12
-msgid "Location of Calibre Database"
-msgstr "Calibre Database 위치"
-
-#: cps/templates/config_db.html:22
-msgid "Use Google Drive?"
-msgstr "Google 드라이브를 사용하시겠습니까?"
-
-#: cps/templates/config_db.html:27
-msgid "Authenticate Google Drive"
-msgstr "구글 드라이브 인증"
-
-#: cps/templates/config_db.html:32
-msgid "Google Drive Calibre folder"
-msgstr "Google Drive Calibre 폴더"
-
-#: cps/templates/config_db.html:40
-msgid "Metadata Watch Channel ID"
-msgstr "Metadata Watch Channel ID"
-
-#: cps/templates/config_db.html:43
-msgid "Revoke"
-msgstr "취소"
-
-#: cps/templates/config_db.html:68
-msgid "New db location is invalid, please enter valid path"
-msgstr "새 db 위치가 잘못되었습니다. 올바른 경로를 입력하십시오."
-
-#: cps/templates/config_edit.html:18
-msgid "Server Configuration"
-msgstr "서버 구성"
-
-#: cps/templates/config_edit.html:25
-msgid "Server Port"
-msgstr "Server Port"
-
-#: cps/templates/config_edit.html:28
-msgid "SSL certfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL 인증서 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
-
-#: cps/templates/config_edit.html:35
-msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
-msgstr "SSL 키 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
-
-#: cps/templates/config_edit.html:43
-msgid "Update Channel"
-msgstr "업데이트 취소"
-
-#: cps/templates/config_edit.html:45
-msgid "Stable"
-msgstr "안정버전"
-
-#: cps/templates/config_edit.html:46
-msgid "Nightly"
-msgstr "실험버전"
-
-#: cps/templates/config_edit.html:50
-msgid "Trusted Hosts (Comma Separated)"
-msgstr "신뢰할 수 있는 호스트(쉼표로 구분)"
-
-#: cps/templates/config_edit.html:61
-msgid "Logfile Configuration"
-msgstr "Logfile 설정"
-
-#: cps/templates/config_edit.html:77
-msgid "Location and name of logfile (calibre-web.log for no entry)"
-msgstr "로그 파일의 위치 및 이름(항목이 없는 경우 calibre-web.log)"
-
-#: cps/templates/config_edit.html:82
-msgid "Enable Access Log"
-msgstr "액세스 로그 활성화"
-
-#: cps/templates/config_edit.html:85
-msgid "Location and name of access logfile (access.log for no entry)"
-msgstr "액세스 로그 파일의 위치 및 이름(항목이 없는 경우 access.log)"
-
-#: cps/templates/config_edit.html:96
-msgid "Feature Configuration"
-msgstr "기능 설정"
-
-#: cps/templates/config_edit.html:104
-msgid "Convert non-English characters in title and author while saving to disk"
-msgstr "제목과 저자가 영어가 아닌 경우 원어로 저장하기"
-
-#: cps/templates/config_edit.html:108
-msgid "Enable Uploads"
-msgstr "업로드 활성화"
-
-#: cps/templates/config_edit.html:108
-msgid "(Please ensure users having also upload rights)"
-msgstr "(사용자에게 업로드 권한도 있는지 확인하십시오)"
-
-#: cps/templates/config_edit.html:112
-msgid "Allowed Upload Fileformats"
-msgstr "허용된 업로드 파일 형식"
-
-#: cps/templates/config_edit.html:118
-msgid "Enable Anonymous Browsing"
-msgstr "익명 탐색 활성화"
-
-#: cps/templates/config_edit.html:122
-msgid "Enable Public Registration"
-msgstr "공개 등록 활성화"
-
-#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
-msgstr "이메일을 사용자 이름으로 사용"
-
-#: cps/templates/config_edit.html:132
-msgid "Enable Magic Link Remote Login"
-msgstr "Enable Magic Link Remote Login"
-
-#: cps/templates/config_edit.html:137
-msgid "Enable Kobo sync"
-msgstr "Kobo sync 활성화"
-
-#: cps/templates/config_edit.html:142
-msgid "Proxy unknown requests to Kobo Store"
-msgstr "Kobo Store에 알 수 없는 요청 프록시"
-
-#: cps/templates/config_edit.html:145
-msgid "Server External Port (for port forwarded API calls)"
-msgstr "서버 외부 포트(포트 전달 API 호출용)"
-
-#: cps/templates/config_edit.html:153
-msgid "Use Goodreads"
-msgstr "Goodreads 사용"
-
-#: cps/templates/config_edit.html:154
-msgid "Create an API Key"
-msgstr "API 키 생성"
-
-#: cps/templates/config_edit.html:158
-msgid "Goodreads API Key"
-msgstr "Goodreads API Key"
-
-#: cps/templates/config_edit.html:162
-msgid "Goodreads API Secret"
-msgstr "Goodreads API Secret"
-
-#: cps/templates/config_edit.html:169
-msgid "Allow Reverse Proxy Authentication"
-msgstr "역방향 프록시 인증 허용"
-
-#: cps/templates/config_edit.html:180
-msgid "Login type"
-msgstr "로그인 유형"
-
-#: cps/templates/config_edit.html:182
-msgid "Use Standard Authentication"
-msgstr "표준 인증 사용"
-
-#: cps/templates/config_edit.html:184
-msgid "Use LDAP Authentication"
-msgstr "LDAP 인증 사용"
-
-#: cps/templates/config_edit.html:187
-msgid "Use OAuth"
-msgstr "OAuth 사용"
-
-#: cps/templates/config_edit.html:194
-msgid "LDAP Server Host Name or IP Address"
-msgstr "LDAP 서버 호스트 이름 또는 IP 주소"
-
-#: cps/templates/config_edit.html:198
-msgid "LDAP Server Port"
-msgstr "LDAP 서버 포트"
-
-#: cps/templates/config_edit.html:202
-msgid "LDAP Encryption"
-msgstr "LDAP 암호화"
-
-#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
-#: cps/templates/email_edit.html:41
-msgid "None"
-msgstr "None"
-
-#: cps/templates/config_edit.html:205
-msgid "TLS"
-msgstr "TLS"
-
-#: cps/templates/config_edit.html:206
-msgid "SSL"
-msgstr "SSL"
-
-#: cps/templates/config_edit.html:210
-msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP CACertificate 경로(클라이언트 인증서 인증에만 필요)"
-
-#: cps/templates/config_edit.html:217
-msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP 인증서 경로(클라이언트 인증서 인증에만 필요)"
-
-#: cps/templates/config_edit.html:224
-msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr "LDAP 키 파일 경로(클라이언트 인증서 인증에만 필요)"
-
-#: cps/templates/config_edit.html:233
-msgid "LDAP Authentication"
-msgstr "LDAP 인증"
-
-#: cps/templates/config_edit.html:235
-msgid "Anonymous"
-msgstr "익명"
-
-#: cps/templates/config_edit.html:236
-msgid "Unauthenticated"
-msgstr "인증되지 않음"
-
-#: cps/templates/config_edit.html:237
-msgid "Simple"
-msgstr "Simple"
-
-#: cps/templates/config_edit.html:242
-msgid "LDAP Administrator Username"
-msgstr "LDAP 관리자 사용자 이름"
-
-#: cps/templates/config_edit.html:248
-msgid "LDAP Administrator Password"
-msgstr "LDAP 관리자 비밀번호"
-
-#: cps/templates/config_edit.html:253
-msgid "LDAP Distinguished Name (DN)"
-msgstr "LDAP 고유 이름(DN)"
-
-#: cps/templates/config_edit.html:257
-msgid "LDAP User Object Filter"
-msgstr "LDAP 사용자 개체 필터"
-
-#: cps/templates/config_edit.html:262
-msgid "LDAP Server is OpenLDAP?"
-msgstr "LDAP 서버는 OpenLDAP입니까?"
-
-#: cps/templates/config_edit.html:264
-msgid "Following Settings are Needed For User Import"
-msgstr "사용자 가져오기에는 다음 설정이 필요합니다."
-
-#: cps/templates/config_edit.html:266
-msgid "LDAP Group Object Filter"
-msgstr "LDAP 그룹 개체 필터"
-
-#: cps/templates/config_edit.html:270
-msgid "LDAP Group Name"
-msgstr "DAP 그룹 이름"
-
-#: cps/templates/config_edit.html:274
-msgid "LDAP Group Members Field"
-msgstr "LDAP 그룹 구성원 필드"
-
-#: cps/templates/config_edit.html:278
-msgid "LDAP Member User Filter Detection"
-msgstr "LDAP 구성원 사용자 필터 감지"
-
-#: cps/templates/config_edit.html:280
-msgid "Autodetect"
-msgstr "자동 감지"
-
-#: cps/templates/config_edit.html:281
-msgid "Custom Filter"
-msgstr "맞춤 필터"
-
-#: cps/templates/config_edit.html:286
-msgid "LDAP Member User Filter"
-msgstr "LDAP 구성원 사용자 필터"
-
-#: cps/templates/config_edit.html:297
-#, python-format
-msgid "Obtain %(provider)s OAuth Credential"
-msgstr "%(provider)s OAuth 자격 증명 얻기"
-
-#: cps/templates/config_edit.html:300
-#, python-format
-msgid "%(provider)s OAuth Client Id"
-msgstr "%(provider)s OAuth 클라이언트 ID"
-
-#: cps/templates/config_edit.html:304
-#, python-format
-msgid "%(provider)s OAuth Client Secret"
-msgstr "%(provider)s OAuth 클라이언트 암호"
-
-#: cps/templates/config_edit.html:320
-msgid "External binaries"
-msgstr "외부 바이너리"
-
-#: cps/templates/config_edit.html:326
-msgid "Path to Calibre E-Book Converter"
-msgstr "Calibre E-Book 변환기 경로"
-
-#: cps/templates/config_edit.html:334
-msgid "Calibre E-Book Converter Settings"
-msgstr "Calibre E-Book 변환기 경로 설정"
-
-#: cps/templates/config_edit.html:337
-msgid "Path to Kepubify E-Book Converter"
-msgstr "Kepubify 전자책 변환기 경로"
-
-#: cps/templates/config_edit.html:345
-msgid "Location of Unrar binary"
-msgstr "Unrar 바이너리의 위치"
-
-#: cps/templates/config_view_edit.html:17
-msgid "View Configuration"
-msgstr "환경 설정 보기"
-
-#: cps/templates/config_view_edit.html:32
-msgid "No. of Random Books to Display"
-msgstr "랜덤 보기시 표시할 책 수"
-
-#: cps/templates/config_view_edit.html:36
-msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
-msgstr "숨기기 전에 표시할 저자 수(0=숨기기 비활성화)"
-
-#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
-msgid "Theme"
-msgstr "테마"
-
-#: cps/templates/config_view_edit.html:42
-msgid "Standard Theme"
-msgstr "기본 테마"
-
-#: cps/templates/config_view_edit.html:43
-msgid "caliBlur! Dark Theme"
-msgstr "caliBlur! 다크 모드"
-
-#: cps/templates/config_view_edit.html:47
-msgid "Regular Expression for Ignoring Columns"
-msgstr "열을 무시하는 정규식"
-
-#: cps/templates/config_view_edit.html:51
-msgid "Link Read/Unread Status to Calibre Column"
-msgstr "읽음/읽지 않음 상태를 Calibre 열에 연결"
-
-#: cps/templates/config_view_edit.html:60
-msgid "View Restrictions based on Calibre column"
-msgstr "Calibre 열을 기반으로 한 보기 제한"
-
-#: cps/templates/config_view_edit.html:69
-msgid "Regular Expression for Title Sorting"
-msgstr "제목 정렬을 위한 정규식"
-
-#: cps/templates/config_view_edit.html:80
-msgid "Default Settings for New Users"
-msgstr "새 사용자를 위한 기본 설정"
-
-#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
-msgid "Admin User"
-msgstr "관리자"
-
-#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
-msgid "Allow Downloads"
-msgstr "다운로드 허용"
-
-#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
-msgid "Allow eBook Viewer"
-msgstr "책 보기 허용"
-
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
-msgid "Allow Uploads"
-msgstr "업로드 허용"
-
-#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
-msgid "Allow Edit"
-msgstr "편집 허용"
-
-#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
-msgid "Allow Delete Books"
-msgstr "책 삭제 허용"
-
-#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
-msgid "Allow Changing Password"
-msgstr "비밀번호 변경 허용"
-
-#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
-msgid "Allow Editing Public Shelves"
-msgstr "공개 서재 편집 허용"
-
-#: cps/templates/config_view_edit.html:123
-msgid "Default Language"
-msgstr "기본 언어"
-
-#: cps/templates/config_view_edit.html:131
-msgid "Default Visible Language of Books"
-msgstr "책의 기본 표시 언어"
-
-#: cps/templates/config_view_edit.html:147
-msgid "Default Visibilities for New Users"
-msgstr "신규 사용자를 위한 기본 기능"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
-#: cps/templates/user_table.html:154
-msgid "Show Random Books in Detail View"
-msgstr "상세 보기에서 임의의 책 표시"
-
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
-msgid "Add Allowed/Denied Tags"
-msgstr "허용/거부 태그 추가"
-
-#: cps/templates/config_view_edit.html:166
-msgid "Add Allowed/Denied custom column values"
-msgstr "허용/거부 사용자 정의 열 값 추가"
-
-#: cps/templates/detail.html:60 cps/templates/detail.html:69
-msgid "Read in Browser"
-msgstr "부라우저에서 보기"
-
-#: cps/templates/detail.html:77 cps/templates/detail.html:94
-msgid "Listen in Browser"
-msgstr "브라우저에서 듣기"
-
-#: cps/templates/detail.html:124
-#, python-format
-msgid "Book %(index)s of %(range)s"
-msgstr "책 %(index)s의 %(range)s"
-
-#: cps/templates/detail.html:173
-msgid "Published"
-msgstr "출간일"
-
-#: cps/templates/detail.html:221
-msgid "Mark As Unread"
-msgstr "읽지 않은 상태로 표시"
-
-#: cps/templates/detail.html:221
-msgid "Mark As Read"
-msgstr "읽은 상태로 표시"
-
-#: cps/templates/detail.html:222
-msgid "Read"
-msgstr "읽기"
-
-#: cps/templates/detail.html:231
-msgid "Restore from archive"
-msgstr "아카이브에서 복원"
-
-#: cps/templates/detail.html:231
-msgid "Add to archive"
-msgstr "아카이브에 추가"
-
-#: cps/templates/detail.html:232
-msgid "Archived"
-msgstr "보관됨"
-
-#: cps/templates/detail.html:243
-msgid "Description:"
-msgstr "설명:"
-
-#: cps/templates/detail.html:256 cps/templates/search.html:14
-msgid "Add to shelf"
-msgstr "서재에 추가"
-
-#: cps/templates/detail.html:267 cps/templates/detail.html:284
-#: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:20
-msgid "(Public)"
-msgstr "(공개)"
-
-#: cps/templates/detail.html:298
-msgid "Edit Metadata"
-msgstr "메타저오 편집"
-
-#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
-msgstr "서버 유형 선택"
-
-#: cps/templates/email_edit.html:15
-msgid "Use Standard E-Mail Account"
-msgstr "표준 이메일 계정 사용"
-
-#: cps/templates/email_edit.html:16
-msgid "Gmail Account with OAuth2 Verification"
-msgstr "OAuth2 인증이 있는 Gmail 계정"
-
-#: cps/templates/email_edit.html:22
-msgid "Setup Gmail Account as E-Mail Server"
-msgstr "Gmail 계정을 이메일 서버로 설정"
-
-#: cps/templates/email_edit.html:24
-msgid "Revoke Gmail Access"
-msgstr "Gmail 액세스 취소"
-
-#: cps/templates/email_edit.html:42
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: cps/templates/email_edit.html:43
-msgid "SSL/TLS"
-msgstr "SSL/TLS"
-
-#: cps/templates/email_edit.html:51
-msgid "SMTP Password"
-msgstr "SMTP 비밀번호"
-
-#: cps/templates/email_edit.html:58
-msgid "Attachment Size Limit"
-msgstr "첨부 파일 크기 제한"
-
-#: cps/templates/email_edit.html:66
-msgid "Save and Send Test E-mail"
-msgstr "저장 후 테스트 이메일 보내기"
-
-#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
-#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
-msgid "Back"
-msgstr "뒤로"
-
-#: cps/templates/email_edit.html:74
-msgid "Allowed Domains (Whitelist)"
-msgstr "허용하는 도메인(화이트 리스트)"
-
-#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
-msgid "Add Domain"
-msgstr "도메인 추가"
-
-#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
-#: cps/templates/user_table.html:27
-msgid "Add"
-msgstr "추가"
-
-#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
-msgid "Enter domainname"
-msgstr "도메인 입력"
-
-#: cps/templates/email_edit.html:92
-msgid "Denied Domains (Blacklist)"
-msgstr "거부 도메인(블랙리스트)"
-
-#: cps/templates/feed.xml:21 cps/templates/layout.html:170
-msgid "Next"
-msgstr "다음"
-
-#: cps/templates/generate_kobo_auth_url.html:5
-msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
-msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집)합니다."
-
-#: cps/templates/http_error.html:31
-msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
-msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의하십시오."
-
-#: cps/templates/http_error.html:41
-msgid "Create Issue"
-msgstr "이슈 생성"
-
-#: cps/templates/http_error.html:48
-msgid "Return to Home"
-msgstr "홈으로"
-
-#: cps/templates/http_error.html:50
-msgid "Logout User"
-msgstr "로그아웃"
-
-#: cps/templates/index.html:69
-msgid "Sort ascending according to download count"
-msgstr "다운로드 횟수에 따라 오름차순 정렬"
-
-#: cps/templates/index.html:70
-msgid "Sort descending according to download count"
-msgstr "다운로드 횟수에 따라 내림차순 정렬"
-
-#: cps/templates/index.html:76 cps/templates/search.html:33
-#: cps/templates/shelf.html:23
-msgid "Sort authors in alphabetical order"
-msgstr "저자를 가나다순(알파벳순)으로 정렬"
-
-#: cps/templates/index.html:77 cps/templates/search.html:34
-#: cps/templates/shelf.html:24
-msgid "Sort authors in reverse alphabetical order"
-msgstr "저자를 가나다(알파벳) 역순으로 정렬"
-
-#: cps/templates/index.html:81
-msgid "Sort ascending according to series index"
-msgstr "시리즈 인덱스에 따라 오름차순 정렬"
-
-#: cps/templates/index.html:82
-msgid "Sort descending according to series index"
-msgstr "시리즈 인덱스에 따라 내림차순 정렬"
-
-#: cps/templates/index.xml:6
-msgid "Start"
-msgstr "시작"
-
-#: cps/templates/index.xml:18
-msgid "Alphabetical Books"
-msgstr "가나다(알파벳) 순"
-
-#: cps/templates/index.xml:22
-msgid "Books sorted alphabetically"
-msgstr "가나다(알파벳)순으로 정렬한 책"
-
-#: cps/templates/index.xml:29
-msgid "Popular publications from this catalog based on Downloads."
-msgstr "다운로드 기준 인기 도서."
-
-#: cps/templates/index.xml:36
-msgid "Popular publications from this catalog based on Rating."
-msgstr "별점 기준 인기 도서"
-
-#: cps/templates/index.xml:39
-msgid "Recently added Books"
-msgstr "최근 추가된 도서"
-
-#: cps/templates/index.xml:43
-msgid "The latest Books"
-msgstr "최신 도서"
-
-#: cps/templates/index.xml:46
-msgid "Random Books"
-msgstr "랜덤 정렬"
-
-#: cps/templates/index.xml:73
-msgid "Books ordered by Author"
-msgstr "저자별 정렬"
-
-#: cps/templates/index.xml:80
-msgid "Books ordered by publisher"
-msgstr "출판사별 정렬"
-
-#: cps/templates/index.xml:87
-msgid "Books ordered by category"
-msgstr "카테고리별 정렬"
-
-#: cps/templates/index.xml:94
-msgid "Books ordered by series"
-msgstr "시리즈별 정렬"
-
-#: cps/templates/index.xml:101
-msgid "Books ordered by Languages"
-msgstr "언어별 정렬"
-
-#: cps/templates/index.xml:108
-msgid "Books ordered by Rating"
-msgstr "평점별 정렬"
-
-#: cps/templates/index.xml:116
-msgid "Books ordered by file formats"
-msgstr "파일 종류별 정렬"
-
-#: cps/templates/index.xml:119 cps/templates/layout.html:135
-#: cps/templates/search_form.html:87
-msgid "Shelves"
-msgstr "서재"
-
-#: cps/templates/index.xml:123
-msgid "Books organized in shelves"
-msgstr "서재별 정렬"
-
-#: cps/templates/layout.html:29
-msgid "Home"
-msgstr "홈"
-
-#: cps/templates/layout.html:35
-msgid "Toggle Navigation"
-msgstr "탐색 활성화"
-
-#: cps/templates/layout.html:46
-msgid "Search Library"
-msgstr "검색"
-
-#: cps/templates/layout.html:63 cps/templates/layout.html:117
-msgid "Uploading..."
-msgstr "업로드 중..."
-
-#: cps/templates/layout.html:63
-msgid "Error"
-msgstr "오류"
-
-#: cps/templates/layout.html:63
-msgid "Upload done, processing, please wait..."
-msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
-
-#: cps/templates/layout.html:76 cps/templates/read.html:72
-#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
-msgid "Settings"
-msgstr "설정"
-
-#: cps/templates/layout.html:78
-msgid "Account"
-msgstr "계정"
-
-#: cps/templates/layout.html:80
-msgid "Logout"
-msgstr "로그아웃"
-
-#: cps/templates/layout.html:118
-msgid "Please do not refresh the page"
-msgstr "페이지를 새로고침 하지 마세요."
-
-#: cps/templates/layout.html:128
-msgid "Browse"
-msgstr "탐색"
-
-#: cps/templates/layout.html:141 cps/templates/stats.html:3
-msgid "About"
-msgstr "서재 정보"
-
-#: cps/templates/layout.html:155
-msgid "Previous"
-msgstr "이전"
-
-#: cps/templates/layout.html:182
-msgid "Book Details"
-msgstr "책 상세정보"
-
-#: cps/templates/login.html:18
-msgid "Remember Me"
-msgstr "로그인 유지"
-
-#: cps/templates/login.html:23
-msgid "Forgot Password?"
-msgstr "비밀번호를 잊으셨나요? "
-
-#: cps/templates/login.html:26
-msgid "Log in with Magic Link"
-msgstr "Magic Link로 로그인"
-
-#: cps/templates/logviewer.html:6
-msgid "Show Calibre-Web Log: "
-msgstr "Calibre-Web 로그 표시:"
-
-#: cps/templates/logviewer.html:8
-msgid "Calibre-Web Log: "
-msgstr "Calibre-Web 로그:"
-
-#: cps/templates/logviewer.html:8
-msgid "Stream output, can't be displayed"
-msgstr "스트림 출력, 표시할 수 없음"
-
-#: cps/templates/logviewer.html:12
-msgid "Show Access Log: "
-msgstr "액세스 로그 표시:"
-
-#: cps/templates/logviewer.html:18
-msgid "Download Calibre-Web Log"
-msgstr "Calibre-Web 로그 다운로드"
-
-#: cps/templates/logviewer.html:21
-msgid "Download Access Log"
-msgstr "Access Log 다운로드"
-
-#: cps/templates/modal_dialogs.html:6
-msgid "Select Allowed/Denied Tags"
-msgstr "허용/거부 태그 선택"
-
-#: cps/templates/modal_dialogs.html:7
-msgid "Select Allowed/Denied Custom Column Values"
-msgstr "허용/거부 사용자 정의 열 값 선택"
-
-#: cps/templates/modal_dialogs.html:8
-msgid "Select Allowed/Denied Tags of User"
-msgstr "사용자의 허용/거부 태그 선택"
-
-#: cps/templates/modal_dialogs.html:9
-msgid "Select Allowed/Denied Custom Column Values of User"
-msgstr "사용자의 사용자 정의 열 값 허용/거부 선택"
-
-#: cps/templates/modal_dialogs.html:15
-msgid "Enter Tag"
-msgstr "태그 입력"
-
-#: cps/templates/modal_dialogs.html:24
-msgid "Add View Restriction"
-msgstr "보기 제한 추가"
-
-#: cps/templates/modal_dialogs.html:50
-msgid "This book format will be permanently erased from database"
-msgstr "이 책 형식은 데이터베이스에서 영구적으로 삭제됩니다."
-
-#: cps/templates/modal_dialogs.html:51
-msgid "This book will be permanently erased from database"
-msgstr "이 책은 데이터베이스에서 영구적으로 삭제됩니다."
-
-#: cps/templates/modal_dialogs.html:52
-msgid "and hard disk"
-msgstr "그리고 하드디스크"
-
-#: cps/templates/modal_dialogs.html:56
-msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
-msgstr "Kobo 참고 사항: 삭제된 책은 페어링된 모든 Kobo 기기에 남아 있습니다."
-
-#: cps/templates/modal_dialogs.html:57
-msgid "Books must first be archived and the device synced before a book can safely be deleted."
-msgstr "책을 안전하게 삭제하려면 먼저 책을 보관하고 기기를 동기화해야 합니다."
-
-#: cps/templates/modal_dialogs.html:76
-msgid "Choose File Location"
-msgstr "파일 위치 선택"
-
-#: cps/templates/modal_dialogs.html:82
-msgid "type"
-msgstr "유형"
-
-#: cps/templates/modal_dialogs.html:83
-msgid "name"
-msgstr "이름"
-
-#: cps/templates/modal_dialogs.html:84
-msgid "size"
-msgstr "크기"
-
-#: cps/templates/modal_dialogs.html:90
-msgid "Parent Directory"
-msgstr "상위 폴더"
-
-#: cps/templates/modal_dialogs.html:98
-msgid "Select"
-msgstr "선택"
-
-#: cps/templates/modal_dialogs.html:134
-msgid "Ok"
-msgstr "Ok"
-
-#: cps/templates/osd.xml:5
-msgid "Calibre-Web eBook Catalog"
-msgstr "Calibre-Web 책 목록"
-
-#: cps/templates/read.html:6
-msgid "epub Reader"
-msgstr "EPUB 리더"
-
-#: cps/templates/read.html:75
-msgid "Reflow text when sidebars are open."
-msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
-
-#: cps/templates/readcbr.html:7
-msgid "Comic Reader"
-msgstr "코믹 리더"
-
-#: cps/templates/readcbr.html:89
-msgid "Keyboard Shortcuts"
-msgstr "키보드 단축키"
-
-#: cps/templates/readcbr.html:92
-msgid "Previous Page"
-msgstr "이전 페이지"
-
-#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
-msgid "Next Page"
-msgstr "다음 페이지"
-
-#: cps/templates/readcbr.html:94
-msgid "Scale to Best"
-msgstr "최적 크기"
-
-#: cps/templates/readcbr.html:95
-msgid "Scale to Width"
-msgstr "폭 조절"
-
-#: cps/templates/readcbr.html:96
-msgid "Scale to Height"
-msgstr "높이 조절"
-
-#: cps/templates/readcbr.html:97
-msgid "Scale to Native"
-msgstr "기본 크기"
-
-#: cps/templates/readcbr.html:98
-msgid "Rotate Right"
-msgstr "오른쪽으로 회전"
-
-#: cps/templates/readcbr.html:99
-msgid "Rotate Left"
-msgstr "왼쪽으로 회전"
-
-#: cps/templates/readcbr.html:100
-msgid "Flip Image"
-msgstr "이미지 뒤집기"
-
-#: cps/templates/readcbr.html:116
-msgid "Light"
-msgstr "밝게"
-
-#: cps/templates/readcbr.html:117
-msgid "Dark"
-msgstr "어둡게"
-
-#: cps/templates/readcbr.html:122
-msgid "Scale"
-msgstr "크기"
-
-#: cps/templates/readcbr.html:125
-msgid "Best"
-msgstr "최적"
-
-#: cps/templates/readcbr.html:126
-msgid "Width"
-msgstr "폭"
-
-#: cps/templates/readcbr.html:127
-msgid "Height"
-msgstr "높이"
-
-#: cps/templates/readcbr.html:128
-msgid "Native"
-msgstr "기본"
-
-#: cps/templates/readcbr.html:133
-msgid "Rotate"
-msgstr "회전"
-
-#: cps/templates/readcbr.html:144
-msgid "Flip"
-msgstr "뒤집기"
-
-#: cps/templates/readcbr.html:147
-msgid "Horizontal"
-msgstr "수평"
-
-#: cps/templates/readcbr.html:148
-msgid "Vertical"
-msgstr "수직"
-
-#: cps/templates/readcbr.html:153
-msgid "Direction"
-msgstr "방향"
-
-#: cps/templates/readcbr.html:156
-msgid "Left to Right"
-msgstr "왼쪽에서 오른쪽"
-
-#: cps/templates/readcbr.html:157
-msgid "Right to Left"
-msgstr "오른쪽에서 왼쪽"
-
-#: cps/templates/readcbr.html:165
-msgid "Reset to Top"
-msgstr "맨 위로 재설정"
-
-#: cps/templates/readcbr.html:166
-msgid "Remember Position"
-msgstr "위치 기억"
-
-#: cps/templates/readcbr.html:171
-msgid "Scrollbar"
-msgstr "스크롤바"
-
-#: cps/templates/readcbr.html:174
-msgid "Show"
-msgstr "보기"
-
-#: cps/templates/readcbr.html:175
-msgid "Hide"
-msgstr "숨기기"
-
-#: cps/templates/readdjvu.html:5
-msgid "DJVU Reader"
-msgstr "DJVU 리더"
-
-#: cps/templates/readpdf.html:29
-msgid "PDF Reader"
-msgstr "PDF 리더"
-
-#: cps/templates/readtxt.html:6
-msgid "txt Reader"
-msgstr "텍스트 리더"
-
-#: cps/templates/register.html:4
-msgid "Register New Account"
-msgstr "새 계정 등록"
-
-#: cps/templates/register.html:10
-msgid "Choose a username"
-msgstr "사용자 이름 선택"
-
-#: cps/templates/register.html:15
-msgid "Your email address"
-msgstr "이메일 주소"
-
-#: cps/templates/remote_login.html:5
-msgid "Magic Link - Authorise New Device"
-msgstr "Magic Link - 새 장치 승인"
-
-#: cps/templates/remote_login.html:7
-msgid "On another device, login and visit:"
-msgstr "다른 기기에서 로그인하고 방문하세요."
-
-#: cps/templates/remote_login.html:11
-msgid "Once verified, you will automatically be logged in on this device."
-msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
-
-#: cps/templates/remote_login.html:14
-msgid "This verification link will expire in 10 minutes."
-msgstr "이 확인 링크는 10분 후에 만료됩니다."
-
-#: cps/templates/search.html:5
-msgid "No Results Found"
-msgstr "결과가 없습니다."
-
-#: cps/templates/search.html:6
-msgid "Search Term:"
-msgstr "검색어: "
-
-#: cps/templates/search.html:8
-msgid "Results for:"
-msgstr "결과:"
-
-#: cps/templates/search_form.html:21
-msgid "Published Date From"
-msgstr "출간일(부터)"
-
-#: cps/templates/search_form.html:31
-msgid "Published Date To"
-msgstr "출간일(까지)"
-
-#: cps/templates/search_form.html:42
-msgid "Read Status"
-msgstr "읽은 상태"
-
-#: cps/templates/search_form.html:59
-msgid "Exclude Tags"
-msgstr "태그 제외"
-
-#: cps/templates/search_form.html:77
-msgid "Exclude Series"
-msgstr "시리즈 제외"
-
-#: cps/templates/search_form.html:95
-msgid "Exclude Shelves"
-msgstr "서재 제외"
-
-#: cps/templates/search_form.html:115
-msgid "Exclude Languages"
-msgstr "언어 제외"
-
-#: cps/templates/search_form.html:126
-msgid "Extensions"
-msgstr "확장자"
-
-#: cps/templates/search_form.html:134
-msgid "Exclude Extensions"
-msgstr "확장자 제외"
-
-#: cps/templates/search_form.html:144
-msgid "Rating Above"
-msgstr "평점(이상)"
-
-#: cps/templates/search_form.html:148
-msgid "Rating Below"
-msgstr "평점(이하)"
-
-#: cps/templates/search_form.html:180
-msgid "From:"
-msgstr "부터:"
-
-#: cps/templates/search_form.html:190
-msgid "To:"
-msgstr "까지:"
-
-#: cps/templates/shelf.html:12
-msgid "Delete this Shelf"
-msgstr "이 서재 삭제"
-
-#: cps/templates/shelf.html:13
-msgid "Edit Shelf Properties"
-msgstr "서재 속성 편집"
-
-#: cps/templates/shelf.html:16
-msgid "Arrange books manually"
-msgstr "수동으로 책 정렬"
-
-#: cps/templates/shelf.html:17
-msgid "Disable Change order"
-msgstr "정렬 변경 비활성화"
-
-#: cps/templates/shelf.html:17
-msgid "Enable Change order"
-msgstr "정렬 변경 활성화"
-
-#: cps/templates/shelf_edit.html:14
-msgid "Share with Everyone"
-msgstr "모두와 공유"
-
-#: cps/templates/shelf_edit.html:21
-msgid "Sync this shelf with Kobo device"
-msgstr "이 서재를 Kobo 기기와 동기화"
-
-#: cps/templates/shelf_order.html:5
-msgid "Drag to Rearrange Order"
-msgstr "드래그하여 순서 변경"
-
-#: cps/templates/shelf_order.html:33
-msgid "Hidden Book"
-msgstr "숨겨진 책"
-
-#: cps/templates/stats.html:7
-msgid "Library Statistics"
-msgstr "Calibre 서재 통계"
-
-#: cps/templates/stats.html:12
-msgid "Books in this Library"
-msgstr "이 서재의 책들"
-
-#: cps/templates/stats.html:16
-msgid "Authors in this Library"
-msgstr "이 서재의 저자"
-
-#: cps/templates/stats.html:20
-msgid "Categories in this Library"
-msgstr "이 서재의 카테고리"
-
-#: cps/templates/stats.html:24
-msgid "Series in this Library"
-msgstr "이 서재의 시리즈"
-
-#: cps/templates/stats.html:29
-msgid "System Statistics"
-msgstr "시스템 통계"
-
-#: cps/templates/stats.html:33
-msgid "Program Library"
-msgstr "서재 프로그램"
-
-#: cps/templates/stats.html:34
-msgid "Installed Version"
-msgstr "설치 버전"
-
-#: cps/templates/tasks.html:12
-msgid "User"
-msgstr "사용자"
-
-#: cps/templates/tasks.html:14
-msgid "Task"
-msgstr "작업"
-
-#: cps/templates/tasks.html:15
-msgid "Status"
-msgstr "상태"
-
-#: cps/templates/tasks.html:16
-msgid "Progress"
-msgstr "Progress"
-
-#: cps/templates/tasks.html:17
-msgid "Run Time"
-msgstr "실행 시간"
-
-#: cps/templates/tasks.html:18
-msgid "Start Time"
-msgstr "시작 시간"
-
-#: cps/templates/user_edit.html:20
-msgid "Reset user Password"
-msgstr "사용자 비밀번호 초기화"
-
-#: cps/templates/user_edit.html:43
-msgid "Language of Books"
-msgstr "책 언어"
-
-#: cps/templates/user_edit.html:54
-msgid "OAuth Settings"
-msgstr "OAuth 설정"
-
-#: cps/templates/user_edit.html:56
-msgid "Link"
-msgstr "링크"
-
-#: cps/templates/user_edit.html:58
-msgid "Unlink"
-msgstr "링크 해제"
-
-#: cps/templates/user_edit.html:64
-msgid "Kobo Sync Token"
-msgstr "코보 연동 토큰"
-
-#: cps/templates/user_edit.html:66
-msgid "Create/View"
-msgstr "생성/보기"
-
-#: cps/templates/user_edit.html:70
-msgid "Force full kobo sync"
-msgstr "강제로 코보 전체 동기화"
-
-#: cps/templates/user_edit.html:88
-msgid "Add allowed/Denied Custom Column Values"
-msgstr "허용/거부 사용자 정의 열 값 추가"
-
-#: cps/templates/user_edit.html:137
-msgid "Sync only books in selected shelves with Kobo"
-msgstr "선택한 서가에 있는 책만 Kobo와 동기화"
-
-#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
-msgid "Delete User"
-msgstr "사용자 삭제"
-
-#: cps/templates/user_edit.html:159
-msgid "Generate Kobo Auth URL"
-msgstr "Kobo Auth URL 생성"
-
-#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
-msgid "Select..."
-msgstr "선택..."
-
-#: cps/templates/user_table.html:131
-msgid "Edit User"
-msgstr "사용자 편집"
-
-#: cps/templates/user_table.html:134
-msgid "Enter Username"
-msgstr "사용자 이름"
-
-#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
-msgstr "이메일 주소 입력"
-
-#: cps/templates/user_table.html:136
-msgid "Enter Kindle E-mail Address"
-msgstr "킨들 이메일 주소 입력"
-
-#: cps/templates/user_table.html:136
-msgid "Kindle E-mail"
-msgstr "킨들 이메일"
-
-#: cps/templates/user_table.html:137
-msgid "Locale"
-msgstr "언어"
-
-#: cps/templates/user_table.html:138
-msgid "Visible Book Languages"
-msgstr "표시할 책 언어"
-
-#: cps/templates/user_table.html:139
-msgid "Edit Allowed Tags"
-msgstr "허용된 태그 편집"
-
-#: cps/templates/user_table.html:139
-msgid "Allowed Tags"
-msgstr "허용된 태그"
-
-#: cps/templates/user_table.html:140
-msgid "Edit Denied Tags"
-msgstr "거부된 태그 편집"
-
-#: cps/templates/user_table.html:140
-msgid "Denied Tags"
-msgstr "거부된 태그"
-
-#: cps/templates/user_table.html:141
-msgid "Edit Allowed Column Values"
-msgstr "허용된 열 값 편집"
-
-#: cps/templates/user_table.html:141
-msgid "Allowed Column Values"
-msgstr "허용되는 열 값"
-
-#: cps/templates/user_table.html:142
-msgid "Edit Denied Column Values"
-msgstr "거부된 열 값 편집"
-
-#: cps/templates/user_table.html:142
-msgid "Denied Column Values"
-msgstr "거부된 열 값"
-
-#: cps/templates/user_table.html:144
-msgid "Change Password"
-msgstr "비밀번호 변경"
-
-#: cps/templates/user_table.html:147
-msgid "View"
-msgstr "보기"
-
-#: cps/templates/user_table.html:150
-msgid "Edit Public Shelves"
-msgstr "공개 서재 편집"
-
-#: cps/templates/user_table.html:152
-msgid "Sync selected Shelves with Kobo"
-msgstr "선택한 서재를 코보와 동기화"
-
-#: cps/templates/user_table.html:156
-msgid "Show read/unread selection"
-msgstr "읽음/읽지 않음 선택 표시"
-
-#: cps/templates/user_table.html:159
-msgid "Show random books"
-msgstr "랜덤 보기 표시"
-
+# Korean translation for Calibre-web
+# Copyright (C) 2022 EPUBGUIDE.NET
+# This file is distributed under the same license as the Calibre-web project
+# First korean translation by 내맘대로의 EPUBGUIDE.NET
+msgid ""
+msgstr ""
+"Project-Id-Version: Calibre-web\n"
+"Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
+"POT-Creation-Date: 2022-01-01 17:51+0100\n"
+"PO-Revision-Date: 2022-01-07 11:06+0900\n"
+"Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
+"Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Generated-By: Babel 2.8.0\n"
+"X-Generator: Poedit 3.0.1\n"
+
+#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
+msgid "not installed"
+msgstr "설치되지 않음"
+
+#: cps/about.py:47 cps/about.py:63
+msgid "installed"
+msgstr "설치됨"
+
+#: cps/about.py:138
+msgid "Statistics"
+msgstr "통계"
+
+#: cps/admin.py:144
+msgid "Server restarted, please reload page"
+msgstr "서버 다시 시작으로 새로고침 필요"
+
+#: cps/admin.py:146
+msgid "Performing shutdown of server, please close window"
+msgstr "서버를 종료하는 중, 창을 닫아야 함"
+
+#: cps/admin.py:154
+msgid "Reconnect successful"
+msgstr "재연결 성공"
+
+#: cps/admin.py:157
+msgid "Unknown command"
+msgstr "알 수 없는 명령"
+
+#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717
+#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891
+#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93
+#: cps/uploader.py:103
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: cps/admin.py:188
+msgid "Admin page"
+msgstr "관리자 페이지"
+
+#: cps/admin.py:207
+msgid "Basic Configuration"
+msgstr "기본 설정"
+
+#: cps/admin.py:244
+msgid "UI Configuration"
+msgstr "UI 설정"
+
+#: cps/admin.py:277 cps/templates/admin.html:50
+msgid "Edit Users"
+msgstr "사용자 관리"
+
+#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
+#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/templates/list.html:13
+msgid "All"
+msgstr "모두"
+
+#: cps/admin.py:343 cps/admin.py:1606
+msgid "User not found"
+msgstr "사용자를 찾을 수 없음"
+
+#: cps/admin.py:357
+msgid "{} users deleted successfully"
+msgstr "{} 사용자를 성공적으로 삭제함"
+
+#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
+msgid "Show All"
+msgstr "모두 보기"
+
+#: cps/admin.py:400 cps/admin.py:406
+msgid "Malformed request"
+msgstr "잘못된 요청"
+
+#: cps/admin.py:418 cps/admin.py:1484
+msgid "Guest Name can't be changed"
+msgstr "Guest 이름은 수정할 수 없음"
+
+#: cps/admin.py:430
+msgid "Guest can't have this role"
+msgstr "Guest는 이 권한을 사용할 수 없음"
+
+#: cps/admin.py:442 cps/admin.py:1442
+msgid "No admin user remaining, can't remove admin role"
+msgstr "관리자 계정이 하나 뿐일 때는 관리자를 삭제할 수 없음"
+
+#: cps/admin.py:446 cps/admin.py:460
+msgid "Value has to be true or false"
+msgstr "값으로 rue 또는 false만 설정 가능"
+
+#: cps/admin.py:448
+msgid "Invalid role"
+msgstr "잘못된 권한"
+
+#: cps/admin.py:452
+msgid "Guest can't have this view"
+msgstr "Guest는 이 view를 사용할 수 없음"
+
+#: cps/admin.py:462
+msgid "Invalid view"
+msgstr "잘못된 view"
+
+#: cps/admin.py:465
+msgid "Guest's Locale is determined automatically and can't be set"
+msgstr "Guest의 로케일은 자동으로 결정되며 설정할 수 없음"
+
+#: cps/admin.py:469
+msgid "No Valid Locale Given"
+msgstr "유효한 로케일이 아님"
+
+#: cps/admin.py:480
+msgid "No Valid Book Language Given"
+msgstr "제공된 책의 언어가 유효하지 않음"
+
+#: cps/admin.py:482
+msgid "Parameter not found"
+msgstr "매개변수를 찾을 수 없음"
+
+#: cps/admin.py:533
+msgid "Invalid Read Column"
+msgstr "잘못된 읽기 열"
+
+#: cps/admin.py:539
+msgid "Invalid Restricted Column"
+msgstr "잘못된 제한된 열"
+
+#: cps/admin.py:560 cps/admin.py:1323
+msgid "Calibre-Web configuration updated"
+msgstr "Calibre-Web 설정이 업데이트 됨"
+
+#: cps/admin.py:572
+msgid "Do you really want to delete the Kobo Token?"
+msgstr "Kobo Token을 삭제하시겠습니까?"
+
+#: cps/admin.py:574
+msgid "Do you really want to delete this domain?"
+msgstr "이 도메인을 삭제하시겠습니까?"
+
+#: cps/admin.py:576
+msgid "Do you really want to delete this user?"
+msgstr "이 사용자를 삭제하시겠습니까?"
+
+#: cps/admin.py:578 cps/templates/shelf.html:91
+msgid "Are you sure you want to delete this shelf?"
+msgstr "이 서재를 삭제하시겠습니까?"
+
+#: cps/admin.py:580
+msgid "Are you sure you want to change locales of selected user(s)?"
+msgstr "선택한 사용자의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:582
+msgid "Are you sure you want to change visible book languages for selected user(s)?"
+msgstr "선택한 사용자에 대해 표시되는 책 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:584
+msgid "Are you sure you want to change the selected role for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 권한을 변경하시겠습니까?"
+
+#: cps/admin.py:586
+msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 제한을 변경하시겠습니까?"
+
+#: cps/admin.py:588
+msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
+msgstr "선택한 사용자에 대해 선택한 가시성 제한을 변경하시겠습니까?"
+
+#: cps/admin.py:590
+msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
+msgstr "선택한 사용자의 실행기 동기화 동작을 변경하시겠습니까?"
+
+#: cps/admin.py:592
+msgid "Are you sure you want to change Calibre library location?"
+msgstr "캘리버 서재의 언어를 변경하시겠습니까?"
+
+#: cps/admin.py:594
+msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
+msgstr "Kobo Reader와 전체 동기화를 강제 실행하기 위해 Calibre-Web의 동기화 데이터베이스를 삭제하시겠습니까?"
+
+#: cps/admin.py:743
+msgid "Tag not found"
+msgstr "태그를 찾을 수 없음"
+
+#: cps/admin.py:755
+msgid "Invalid Action"
+msgstr "잘못된 액션"
+
+#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
+#: cps/templates/user_table.html:58
+msgid "Deny"
+msgstr "거부됨"
+
+#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
+#: cps/templates/user_table.html:61
+msgid "Allow"
+msgstr "허용됨"
+
+#: cps/admin.py:913
+msgid "{} sync entries deleted"
+msgstr "{} 동기화 항목이 삭제됨"
+
+#: cps/admin.py:1036
+msgid "client_secrets.json Is Not Configured For Web Application"
+msgstr "client_secrets.json이 Web 응용프로그램에 대해 설정되지 않음"
+
+#: cps/admin.py:1081
+msgid "Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "로그 파일 위치가 오류. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1087
+msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
+msgstr "액세스 로그 파일 위치가 올바르지 않음. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1087
+msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
+msgstr "LDAP 공급자, 포트, DN 및 사용자 개체 식별자를 입력"
+
+#: cps/admin.py:1087
+msgid "Please Enter a LDAP Service Account and Password"
+msgstr "LDAP 서비스 계정 및 비밀번호를 입력하십시오"
+
+#: cps/admin.py:1126
+msgid "Please Enter a LDAP Service Account"
+msgstr "LDAP 서비스 계정을 입력하십시오"
+
+#: cps/admin.py:1131
+#, python-format
+msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 그룹 개체 필터에는 하나의 \"%s\" 형식 식별자가 필요함"
+
+#: cps/admin.py:1133
+msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 그룹 개체 필터에 일치하지 않는 괄호가 있음"
+
+#: cps/admin.py:1137
+#, python-format
+msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 사용자 개체 필터에는 하나의 \"%s\" 형식 식별자 필요"
+
+#: cps/admin.py:1139
+msgid "LDAP User Object Filter Has Unmatched Parenthesis"
+msgstr "LDAP 사용자 개체 필터에 일치하지 않는 괄호가 있음"
+
+#: cps/admin.py:1146
+#, python-format
+msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
+msgstr "LDAP 구성원 사용자 필터에는 하나의 \"%s\" 형식 식별자 필요"
+
+#: cps/admin.py:1148
+msgid "LDAP Member User Filter Has Unmatched Parenthesis"
+msgstr "LDAP 구성원 사용자 필터에 일치하지 않는 괄호가 있음"
+
+#: cps/admin.py:1155
+msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
+msgstr "유요하지 않은 LDAP CACertificate, 인증서 또는 키 위치. 올바른 경로를 입력 필요"
+
+#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1512
+#: cps/admin.py:1581 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:274 cps/shelf.py:335 cps/shelf.py:370 cps/shelf.py:445
+msgid "Settings DB is not Writeable"
+msgstr "설정 DB에 쓰기 권한이 없음"
+
+#: cps/admin.py:1208
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 DB 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1223
+msgid "DB is not Writeable"
+msgstr "쓰기 권한이 없는 DB"
+
+#: cps/admin.py:1235
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 키 파일 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1239
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "올바르지 않은 인증서 파일 위치. 올바른 경로 입력 필요"
+
+#: cps/admin.py:1239
+msgid "Database Settings updated"
+msgstr "데이터베이스 설정이 업데이트 되었습니다"
+
+#: cps/admin.py:1354
+msgid "Database Configuration"
+msgstr "데이터베이스 구성"
+
+#: cps/admin.py:1370 cps/web.py:1478
+msgid "Please fill out all fields!"
+msgstr "모든 필드를 채워주십시오!"
+
+#: cps/admin.py:1378
+msgid "E-mail is not from valid domain"
+msgstr "유효한 도메인에서 온 이메일이 아니"
+
+#: cps/admin.py:1384 cps/admin.py:1534
+msgid "Add new user"
+msgstr "새 사용자 추가"
+
+#: cps/admin.py:1395
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "사용자 '%(user)s'이(가) 생성됨"
+
+#: cps/admin.py:1401
+msgid "Found an existing account for this e-mail address or name."
+msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
+
+#: cps/admin.py:1421
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "사용자 '%(nick)s'이(가) 삭제됨"
+
+#: cps/admin.py:1423 cps/admin.py:1424
+msgid "Can't delete Guest User"
+msgstr "게스트 사용자는 삭제할 수 없습니다"
+
+#: cps/admin.py:1427
+msgid "No admin user remaining, can't delete user"
+msgstr "관리자 계정이 하나 뿐일 때는 관리자 권한을 삭제할 수 없음"
+
+#: cps/admin.py:1500 cps/admin.py:1625
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "사용자 %(nick)s 편집"
+
+#: cps/admin.py:1504
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "사용자 '%(nick)s'가 업데이트 됨"
+
+#: cps/admin.py:1508 cps/admin.py:1640 cps/web.py:1503 cps/web.py:1563
+msgid "An unknown error occurred. Please try again later."
+msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
+
+#: cps/admin.py:1543 cps/templates/admin.html:98
+msgid "Edit E-mail Server Settings"
+msgstr "이메일 서버 설정 편집"
+
+#: cps/admin.py:1562
+msgid "Gmail Account Verification Successful"
+msgstr "Gmail 계정 인증 성공"
+
+#: cps/admin.py:1588
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "%(email)s에 테스트를 위한 이메일을 보냄. 결과 확인 필요"
+
+#: cps/admin.py:1591
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "테스트 이메일을 보내는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/admin.py:1593
+msgid "Please configure your e-mail address first..."
+msgstr "먼저 이메일 주소를 구성하십시오..."
+
+#: cps/admin.py:1595
+msgid "E-mail server settings updated"
+msgstr "이메일 서버 설정 업데이트됨"
+
+#: cps/admin.py:1637
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "사용자 %(user)s의 비밀번호 재설정"
+
+#: cps/admin.py:1643 cps/web.py:1443
+msgid "Please configure the SMTP mail settings first..."
+msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
+
+#: cps/admin.py:1654
+msgid "Logfile viewer"
+msgstr "로그 파일 뷰어"
+
+#: cps/admin.py:1720
+msgid "Requesting update package"
+msgstr "업데이트 패키지 요청"
+
+#: cps/admin.py:1721
+msgid "Downloading update package"
+msgstr "업데이트 패키지 다운로드"
+
+#: cps/admin.py:1722
+msgid "Unzipping update package"
+msgstr "업데이트 패키지 압축 풀기"
+
+#: cps/admin.py:1723
+msgid "Replacing files"
+msgstr "파일 교체"
+
+#: cps/admin.py:1724
+msgid "Database connections are closed"
+msgstr "데이터베이스 연결이 닫힙니다"
+
+#: cps/admin.py:1725
+msgid "Stopping server"
+msgstr "서버 중지"
+
+#: cps/admin.py:1726
+msgid "Update finished, please press okay and reload page"
+msgstr "업데이트가 완료되었습니다. 확인을 누르고 페이지를 새로고침하세요"
+
+#: cps/admin.py:1727 cps/admin.py:1728 cps/admin.py:1729 cps/admin.py:1730
+#: cps/admin.py:1731 cps/admin.py:1732
+msgid "Update failed:"
+msgstr "업데이트 실패:"
+
+#: cps/admin.py:1727 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
+msgid "HTTP Error"
+msgstr "HTTP 오류"
+
+#: cps/admin.py:1728 cps/updater.py:387 cps/updater.py:599
+msgid "Connection error"
+msgstr "연결 오류"
+
+#: cps/admin.py:1729 cps/updater.py:389 cps/updater.py:601
+msgid "Timeout while establishing connection"
+msgstr "연결 설정 중 시간 초과"
+
+#: cps/admin.py:1730 cps/updater.py:391 cps/updater.py:603
+msgid "General error"
+msgstr "일반 오류"
+
+#: cps/admin.py:1731
+msgid "Update file could not be saved in temp dir"
+msgstr "임시 디렉토리에 업데이트 파일을 저장할 수 없습니다"
+
+#: cps/admin.py:1732
+msgid "Files could not be replaced during update"
+msgstr "업데이트하는 동안 파일을 교체할 수 없습니다"
+
+#: cps/admin.py:1756
+msgid "Failed to extract at least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 추출하지 못했습니다"
+
+#: cps/admin.py:1801
+msgid "Failed to Create at Least One LDAP User"
+msgstr "하나 이상의 LDAP 사용자를 생성하지 못했습니다"
+
+#: cps/admin.py:1814
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "오류: %(ldaperror)s"
+
+#: cps/admin.py:1818
+msgid "Error: No user returned in response of LDAP server"
+msgstr "오류: LDAP 서버의 응답으로 사용자가 반환되지 않았습니다"
+
+#: cps/admin.py:1851
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "데이터베이스에서 하나 이상의 LDAP 사용자를 찾을 수 없습니다"
+
+#: cps/admin.py:1853
+msgid "{} User Successfully Imported"
+msgstr "{} 사용자 가져오기 성공"
+
+#: cps/converter.py:30
+msgid "not configured"
+msgstr "구성되지 않음"
+
+#: cps/converter.py:32
+msgid "Execution permissions missing"
+msgstr "실행 권한 누락"
+
+#: cps/db.py:648 cps/web.py:667 cps/web.py:1154
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr "사용자 정의 열 번호 %(column)d이(가) calibre 데이터베이스에 없습니다"
+
+#: cps/editbooks.py:305 cps/editbooks.py:307
+msgid "Book Format Successfully Deleted"
+msgstr "책 형식이 성공적으로 삭제되었습니다"
+
+#: cps/editbooks.py:314 cps/editbooks.py:316
+msgid "Book Successfully Deleted"
+msgstr "책이 성공적으로 삭제되었습니다"
+
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:523 cps/web.py:1702
+#: cps/web.py:1743 cps/web.py:1810
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다"
+
+#: cps/editbooks.py:406
+msgid "edit metadata"
+msgstr "메타데이터 편집"
+
+#: cps/editbooks.py:454
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s은(는) 유효한 숫자가 아닙니다. 건너뜁니다"
+
+#: cps/editbooks.py:490 cps/editbooks.py:954
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s'은(는) 유효한 언어가 아닙니다"
+
+#: cps/editbooks.py:630 cps/editbooks.py:981
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "파일 확장자 '%(ext)s'은(는) 이 서버에 업로드할 수 없습니다"
+
+#: cps/editbooks.py:634 cps/editbooks.py:985
+msgid "File to be uploaded must have an extension"
+msgstr "업로드할 파일에는 확장자가 있어야 합니다"
+
+#: cps/editbooks.py:646
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "%(path)s 경로를 생성하지 못했습니다(권한이 없음)."
+
+#: cps/editbooks.py:651
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "%(file)s 파일을 저장하지 못했습니다."
+
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1663
+#, python-format
+msgid "Database error: %(error)s."
+msgstr "데이터베이스 오류: %(error)s."
+
+#: cps/editbooks.py:674
+#, python-format
+msgid "File format %(ext)s added to %(book)s"
+msgstr "파일 형식 %(ext)s이(가) %(book)s에 추가되었습니다"
+
+#: cps/editbooks.py:810
+msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
+msgstr "식별자는 대소문자를 구분하지 않으며 이전 식별자를 덮어씁니다"
+
+#: cps/editbooks.py:844
+msgid "Metadata successfully updated"
+msgstr "메타데이터가 성공적으로 업데이트되었습니다"
+
+#: cps/editbooks.py:857
+msgid "Error editing book, please check logfile for details"
+msgstr "책을 수정하는 동안 오류가 발생했습니다. 자세한 내용은 로그 파일을 확인하세요"
+
+#: cps/editbooks.py:895
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
+msgstr "업로드한 책이 라이브러리에 있을 수 있음. 새로 업로드하기 전에 확인 필요: "
+
+#: cps/editbooks.py:993
+#, python-format
+msgid "File %(filename)s could not saved to temp dir"
+msgstr "파일 %(filename)s을(를) 임시 디렉토리에 저장할 수 없습니다"
+
+#: cps/editbooks.py:1012
+#, python-format
+msgid "Failed to Move Cover File %(file)s: %(error)s"
+msgstr "표지 파일%(file)s를 이동하지 못했습니다.:%(error)s"
+
+#: cps/editbooks.py:1059
+#, python-format
+msgid "File %(file)s uploaded"
+msgstr "파일 %(file)s 업로드됨"
+
+#: cps/editbooks.py:1084
+msgid "Source or destination format for conversion missing"
+msgstr "변환을 위한 소스 또는 대상 형식이 누락되었습니다"
+
+#: cps/editbooks.py:1092
+#, python-format
+msgid "Book successfully queued for converting to %(book_format)s"
+msgstr "책이 %(book_format)s(으)로 변환하기 위해 대기 중입니다"
+
+#: cps/editbooks.py:1096
+#, python-format
+msgid "There was an error converting this book: %(res)s"
+msgstr "이 책을 변환하는 동안 오류가 발생했습니다: %(res)s"
+
+#: cps/gdrive.py:58
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Google 드라이브 설정이 완료되지 않았습니다. Google 드라이브를 비활성화했다가 다시 활성화해 보세요"
+
+#: cps/gdrive.py:95
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "콜백 도메인이 확인되지 않았습니다. 단계에 따라 Google 개발자 콘솔에서 도메인을 확인하세요"
+
+#: cps/helper.py:80
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "책 ID에 대한 %(format)s 형식을 찾을 수 없음: %(book)d"
+
+#: cps/helper.py:86 cps/tasks/convert.py:73
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s을(를) Google 드라이브에서 찾을 수 없음: %(fn)s"
+
+#: cps/helper.py:91
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s을(를) 찾을 수 없음: %(fn)s"
+
+#: cps/helper.py:96 cps/helper.py:220 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "킨들로 보내기"
+
+#: cps/helper.py:97 cps/helper.py:114 cps/helper.py:222
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "이 이메일은 Calibre Web을 통해 전송되었습니다."
+
+#: cps/helper.py:112
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web 테스트 이메일"
+
+#: cps/helper.py:113
+msgid "Test e-mail"
+msgstr "테스트 이메일"
+
+#: cps/helper.py:130
+msgid "Get Started with Calibre-Web"
+msgstr "Calibre-Web 시작하기"
+
+#: cps/helper.py:135
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "사용자 등록 이메일: %(name)s"
+
+#: cps/helper.py:146 cps/helper.py:152
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "%(orig)s를 %(format)s로 변환하고 킨들로 보내기"
+
+#: cps/helper.py:171 cps/helper.py:175 cps/helper.py:179
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "킨들에 %(format)s 보내기"
+
+#: cps/helper.py:219 cps/tasks/convert.py:90
+#, python-format
+msgid "%(book)s send to Kindle"
+msgstr "%(book)s을 킨들로 보내기"
+
+#: cps/helper.py:224
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "요청한 파일을 읽을 수 없습니다. 올바른 권한인가요?"
+
+#: cps/helper.py:316
+#, python-format
+msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
+msgstr "책 %(id)s에 대한 책 폴더를 삭제하지 못했습니다. 경로에 하위 폴더가 있습니다: %(path)s"
+
+#: cps/helper.py:322
+#, python-format
+msgid "Deleting book %(id)s failed: %(message)s"
+msgstr "%(id)s 도서 삭제 실패: %(message)s"
+
+#: cps/helper.py:333
+#, python-format
+msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
+msgstr "데이터베이스에서만 책 %(id)s 을(를) 삭제 중, 데이터베이스의 책 경로가 유효하지 않음: %(path)s"
+
+#: cps/helper.py:388
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "제목 이름을 '%(src)s'에서 '%(dest)s'(으)로 변경하지 못했습니다. 오류: %(error)s"
+
+#: cps/helper.py:403
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "'%(src)s' 경로의 파일 이름을 '%(dest)s'(으)로 변경하지 못했습니다. 오류: %(error)s"
+
+#: cps/helper.py:428 cps/helper.py:438 cps/helper.py:446
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Google 드라이브에서 %(file)s 파일을 찾을 수 없습니다"
+
+#: cps/helper.py:467
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다"
+
+#: cps/helper.py:507 cps/web.py:1658
+msgid "Found an existing account for this e-mail address"
+msgstr "등록되어 있는 이메일 주소입니다"
+
+#: cps/helper.py:515
+msgid "This username is already taken"
+msgstr "등록되어 있는 username입니다"
+
+#: cps/helper.py:525
+msgid "Invalid e-mail address format"
+msgstr "이메일 주소 형식이 잘못되었습니다"
+
+#: cps/helper.py:598
+msgid "Error Downloading Cover"
+msgstr "표지 다운로드 중 오류 발생"
+
+#: cps/helper.py:601
+msgid "Cover Format Error"
+msgstr "표지 형식 오류"
+
+#: cps/helper.py:611
+msgid "Failed to create path for cover"
+msgstr "표지 경로 생성 실패"
+
+#: cps/helper.py:627
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr "표지 파일이 유효한 이미지 파일이 아니거나 저장할 수 없습니다"
+
+#: cps/helper.py:638
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr "표지는 jpg/jpeg/png/webp/bmp 파일만 지원됩니다"
+
+#: cps/helper.py:651
+msgid "Invalid cover file content"
+msgstr "잘못된 표지 파일 콘텐츠"
+
+#: cps/helper.py:655
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr "표지 파일로 jpg/jpeg 파일만 지원됩니다"
+
+#: cps/helper.py:707
+msgid "Unrar binary file not found"
+msgstr "Unrar 바이너리 파일을 찾을 수 없습니다"
+
+#: cps/helper.py:718
+msgid "Error excecuting UnRar"
+msgstr "UnRar 실행 오류"
+
+#: cps/helper.py:766
+msgid "Waiting"
+msgstr "대기중"
+
+#: cps/helper.py:768
+msgid "Failed"
+msgstr "실패"
+
+#: cps/helper.py:770
+msgid "Started"
+msgstr "시작됨"
+
+#: cps/helper.py:772
+msgid "Finished"
+msgstr "종료"
+
+#: cps/helper.py:774
+msgid "Unknown Status"
+msgstr "알 수 없는 상태"
+
+#: cps/kobo_auth.py:131
+msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+msgstr "코보(kobo) 장치에 대한 유효한 api_endpoint를 얻으려면 로컬 호스트가 아닌 곳에서 calibre-web에 액세스하십시오"
+
+#: cps/kobo_auth.py:134 cps/kobo_auth.py:162
+msgid "Kobo Setup"
+msgstr "Kobo 설정"
+
+#: cps/oauth_bb.py:77
+#, python-format
+msgid "Register with %(provider)s"
+msgstr "%(provider)s에 등록"
+
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1534
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
+
+#: cps/oauth_bb.py:148
+#, python-format
+msgid "Link to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 성공적으로 연결됨"
+
+#: cps/oauth_bb.py:155
+msgid "Login failed, No User Linked With OAuth Account"
+msgstr "로그인 실패, OAuth 계정과 연결된 사용자 없음"
+
+#: cps/oauth_bb.py:197
+#, python-format
+msgid "Unlink to %(oauth)s Succeeded"
+msgstr "%(oauth)s에 연결 해제 성공"
+
+#: cps/oauth_bb.py:202
+#, python-format
+msgid "Unlink to %(oauth)s Failed"
+msgstr "%(oauth)s에 연결 해제 실패"
+
+#: cps/oauth_bb.py:205
+#, python-format
+msgid "Not Linked to %(oauth)s"
+msgstr "%(oauth)s에 연결되지 않음"
+
+#: cps/oauth_bb.py:261
+msgid "Failed to log in with GitHub."
+msgstr "GitHub에 로그인하지 못했습니다."
+
+#: cps/oauth_bb.py:267
+msgid "Failed to fetch user info from GitHub."
+msgstr "GitHub에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:279
+msgid "Failed to log in with Google."
+msgstr "구글 로그인에 실패했습니다."
+
+#: cps/oauth_bb.py:285
+msgid "Failed to fetch user info from Google."
+msgstr "Google에서 사용자 정보를 가져오지 못했습니다."
+
+#: cps/oauth_bb.py:332
+msgid "GitHub Oauth error, please retry later."
+msgstr "GitHub Oauth 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:335
+msgid "GitHub Oauth error: {}"
+msgstr "GitHub 인증 오류: {}"
+
+#: cps/oauth_bb.py:356
+msgid "Google Oauth error, please retry later."
+msgstr "Google 인증 오류입니다. 나중에 다시 시도하세요."
+
+#: cps/oauth_bb.py:359
+msgid "Google Oauth error: {}"
+msgstr "Google 인증 오류: {}"
+
+#: cps/opds.py:384
+msgid "{} Stars"
+msgstr "{} Stars"
+
+#: cps/remotelogin.py:65 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1583
+msgid "Login"
+msgstr "로그인"
+
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
+msgid "Token not found"
+msgstr "토큰을 찾을 수 없습니다"
+
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
+msgid "Token has expired"
+msgstr "토큰이 만료되었습니다"
+
+#: cps/remotelogin.py:95
+msgid "Success! Please return to your device"
+msgstr "성공! 기기로 돌아가주세요"
+
+#: cps/render_template.py:39 cps/web.py:416
+msgid "Books"
+msgstr "책"
+
+#: cps/render_template.py:41
+msgid "Show recent books"
+msgstr "최근 책 보기"
+
+#: cps/render_template.py:42 cps/templates/index.xml:25
+msgid "Hot Books"
+msgstr "인기있는 책"
+
+#: cps/render_template.py:44
+msgid "Show Hot Books"
+msgstr "주목받는 책 보기"
+
+#: cps/render_template.py:46 cps/render_template.py:51
+msgid "Downloaded Books"
+msgstr "다운로드된 책"
+
+#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/templates/user_table.html:167
+msgid "Show Downloaded Books"
+msgstr "다운로드된 책 보기"
+
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+msgid "Top Rated Books"
+msgstr "평점이 높은 책"
+
+#: cps/render_template.py:58 cps/templates/user_table.html:161
+msgid "Show Top Rated Books"
+msgstr "평점이 높은 책 보기"
+
+#: cps/render_template.py:59 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:676
+msgid "Read Books"
+msgstr "읽은 책"
+
+#: cps/render_template.py:61
+msgid "Show read and unread"
+msgstr "읽은 책과 읽지 않은 책 보기"
+
+#: cps/render_template.py:63 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:679
+msgid "Unread Books"
+msgstr "읽지 않은 책"
+
+#: cps/render_template.py:65
+msgid "Show unread"
+msgstr "읽지 않은 책 보기"
+
+#: cps/render_template.py:66
+msgid "Discover"
+msgstr "발견"
+
+#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/templates/user_table.html:162
+msgid "Show Random Books"
+msgstr "무작위 추천"
+
+#: cps/render_template.py:69 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1041
+msgid "Categories"
+msgstr "카테고리"
+
+#: cps/render_template.py:71 cps/templates/user_table.html:158
+msgid "Show category selection"
+msgstr "카테고리별 보기"
+
+#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/templates/book_table.html:68 cps/templates/index.xml:90
+#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+msgid "Series"
+msgstr "시리즈"
+
+#: cps/render_template.py:74 cps/templates/user_table.html:157
+msgid "Show series selection"
+msgstr "시리즈별 보기"
+
+#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/templates/index.xml:69
+msgid "Authors"
+msgstr "저자"
+
+#: cps/render_template.py:77 cps/templates/user_table.html:160
+msgid "Show author selection"
+msgstr "저자별 보기"
+
+#: cps/render_template.py:79 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:925
+msgid "Publishers"
+msgstr "출판사"
+
+#: cps/render_template.py:81 cps/templates/user_table.html:163
+msgid "Show publisher selection"
+msgstr "출판사별 보기"
+
+#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/templates/index.xml:97 cps/templates/search_form.html:107
+#: cps/web.py:1018
+msgid "Languages"
+msgstr "언어"
+
+#: cps/render_template.py:85 cps/templates/user_table.html:155
+msgid "Show language selection"
+msgstr "언어별 보기"
+
+#: cps/render_template.py:86 cps/templates/index.xml:104
+msgid "Ratings"
+msgstr "평점"
+
+#: cps/render_template.py:88 cps/templates/user_table.html:164
+msgid "Show ratings selection"
+msgstr "평점별 보기"
+
+#: cps/render_template.py:89 cps/templates/index.xml:112
+msgid "File formats"
+msgstr "파일 유형"
+
+#: cps/render_template.py:91 cps/templates/user_table.html:165
+msgid "Show file formats selection"
+msgstr "파일 유형별 보기"
+
+#: cps/render_template.py:93 cps/web.py:703
+msgid "Archived Books"
+msgstr "보관된 책"
+
+#: cps/render_template.py:95 cps/templates/user_table.html:166
+msgid "Show archived books"
+msgstr "보관된 책 보기"
+
+#: cps/render_template.py:97 cps/web.py:780
+msgid "Books List"
+msgstr "책 목록"
+
+#: cps/render_template.py:99 cps/templates/user_table.html:168
+msgid "Show Books List"
+msgstr "책 목록 보기"
+
+#: cps/shelf.py:67 cps/shelf.py:121
+msgid "Invalid shelf specified"
+msgstr "잘못된 책장 지정"
+
+#: cps/shelf.py:73
+msgid "Sorry you are not allowed to add a book to that shelf"
+msgstr "죄송합니다. 해당 책장에 책을 추가할 권한이 없습니다"
+
+#: cps/shelf.py:82
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "책이 이미 책장에 등록됨: %(shelfname)s"
+
+#: cps/shelf.py:107
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "책장에 책이 등록됨: %(sname)s"
+
+#: cps/shelf.py:126
+msgid "You are not allowed to add a book to the shelf"
+msgstr "책장에 책을 추가할 권한이 없습니다"
+
+#: cps/shelf.py:144
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "책장에 이미 책이 등록됨:  %(name)s"
+
+#: cps/shelf.py:156
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "책이 책장에 등록됨: %(sname)s"
+
+#: cps/shelf.py:163
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "책장에 책을 추가할 수 없음: %(sname)s"
+
+#: cps/shelf.py:209
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "책이 책장에서 삭제됨: %(sname)s"
+
+#: cps/shelf.py:218
+msgid "Sorry you are not allowed to remove a book from this shelf"
+msgstr "죄송합니다. 이 서가에서 책을 삭제할 권한이 없습니다"
+
+#: cps/shelf.py:228 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "책장 추가"
+
+#: cps/shelf.py:237
+msgid "Sorry you are not allowed to edit this shelf"
+msgstr "죄송합니다. 이 책장을 편집할 권한이 없습니다"
+
+#: cps/shelf.py:239
+msgid "Edit a shelf"
+msgstr "책장 편집"
+
+#: cps/shelf.py:249
+msgid "Sorry you are not allowed to create a public shelf"
+msgstr "죄송합니다. 이 공개 책장을 만들 권한이 없습니다"
+
+#: cps/shelf.py:261
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s 책장이 추가됨"
+
+#: cps/shelf.py:264
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s 책장이 변경됨"
+
+#: cps/shelf.py:278
+msgid "There was an error"
+msgstr "오류가 발생하였습니다"
+
+#: cps/shelf.py:300
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 공개 책장이 이미 있습니다."
+
+#: cps/shelf.py:311
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "이름이 '%(title)s'인 개인 책장이 이미 있습니다."
+
+#: cps/shelf.py:380
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "책장 순서 변경: '%(name)s'"
+
+#: cps/shelf.py:450
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "책장: '%(name)s'"
+
+#: cps/shelf.py:454
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "책장을 여는 동안 오류가 발생했습니다. 책장이 존재하지 않거나 접근할 수 없습니다"
+
+#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+msgid "Unexpected data while reading update information"
+msgstr "업데이트 정보를 읽는 동안 예기치 않은 데이터"
+
+#: cps/updater.py:410 cps/updater.py:521
+msgid "No update available. You already have the latest version installed"
+msgstr "업데이트가 없습니다. 이미 최신 버전이 설치되어 있습니다"
+
+#: cps/updater.py:428
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:446
+msgid "Could not fetch update information"
+msgstr "업데이트 정보를 가져올 수 없습니다"
+
+#: cps/updater.py:456
+msgid "Click on the button below to update to the latest stable version."
+msgstr "새로운 업데이트가 있습니다. 아래 버튼을 클릭하여 최신 버전으로 업데이트하십시오."
+
+#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "최신 안정 버전 %(version)s으로 업데이트하려면 아래 버튼을 클릭하세요"
+
+#: cps/updater.py:507
+msgid "No release information available"
+msgstr "출시 정보가 없습니다"
+
+#: cps/templates/index.html:5 cps/web.py:440
+msgid "Discover (Random Books)"
+msgstr "발견(무작위 도서)"
+
+#: cps/web.py:471
+msgid "Hot Books (Most Downloaded)"
+msgstr "인기있는 책(가장 많이 다운로드됨)"
+
+#: cps/web.py:507
+#, python-format
+msgid "Downloaded books by %(user)s"
+msgstr "%(user)s이(가) 다운로드한 책"
+
+#: cps/web.py:539
+#, python-format
+msgid "Author: %(name)s"
+msgstr "저자: %(name)s"
+
+#: cps/web.py:554
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "출판사: %(name)s"
+
+#: cps/web.py:569
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "시리즈: %(serie)s"
+
+#: cps/web.py:582
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr "평가: %(rating)s 별"
+
+#: cps/web.py:597
+#, python-format
+msgid "File format: %(format)s"
+msgstr "파일 유형: %(format)s"
+
+#: cps/web.py:615
+#, python-format
+msgid "Category: %(name)s"
+msgstr "카테고리: %(name)s"
+
+#: cps/web.py:631
+#, python-format
+msgid "Language: %(name)s"
+msgstr "언어: %(name)s"
+
+#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1370
+msgid "Advanced Search"
+msgstr "상세 검색"
+
+#: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
+#: cps/templates/index.xml:11 cps/templates/layout.html:45
+#: cps/templates/layout.html:48 cps/templates/search_form.html:226
+#: cps/web.py:750 cps/web.py:1076
+msgid "Search"
+msgstr "검색"
+
+#: cps/templates/admin.html:16 cps/web.py:903
+msgid "Downloads"
+msgstr "다운로드"
+
+#: cps/web.py:980
+msgid "Ratings list"
+msgstr "평점 목록"
+
+#: cps/web.py:1001
+msgid "File formats list"
+msgstr "파일 유형 목록"
+
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+msgid "Tasks"
+msgstr "작업"
+
+#: cps/web.py:1214
+msgid "Published after "
+msgstr "Published after "
+
+#: cps/web.py:1221
+msgid "Published before "
+msgstr "Published before "
+
+#: cps/web.py:1243
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "평점 <= %(rating)s"
+
+#: cps/web.py:1245
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "평점 >= %(rating)s"
+
+#: cps/web.py:1247
+#, python-format
+msgid "Read Status = %(status)s"
+msgstr "읽은 상태 = %(status)s"
+
+#: cps/web.py:1352
+msgid "Error on search for custom columns, please restart Calibre-Web"
+msgstr "사용자 정의 열을 검색하는 동안 오류가 발생했습니다. Calibre-Web을 다시 시작하십시오"
+
+#: cps/web.py:1448
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
+
+#: cps/web.py:1452
+#, python-format
+msgid "Oops! There was an error sending this book: %(res)s"
+msgstr "책을 보내는 중에 오류 발생: %(res)s"
+
+#: cps/web.py:1454
+msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
+
+#: cps/web.py:1471
+msgid "E-Mail server is not configured, please contact your administrator!"
+msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
+
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1472
+#: cps/web.py:1479 cps/web.py:1485 cps/web.py:1504 cps/web.py:1508
+#: cps/web.py:1514
+msgid "Register"
+msgstr "등록"
+
+#: cps/web.py:1506
+msgid "Your e-mail is not allowed to register"
+msgstr "이메일을 등록할 수 없습니다"
+
+#: cps/web.py:1509
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "확인을 위한 이메일이 발송되었습니다."
+
+#: cps/web.py:1523
+msgid "Cannot activate LDAP authentication"
+msgstr "LDAP 인증을 활성화할 수 없습니다"
+
+#: cps/web.py:1542
+#, python-format
+msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
+
+#: cps/web.py:1548
+#, python-format
+msgid "Could not login: %(message)s"
+msgstr "로그인 실패: %(message)s"
+
+#: cps/web.py:1552 cps/web.py:1577
+msgid "Wrong Username or Password"
+msgstr "잘못된 사용자명 또는 비밀번호"
+
+#: cps/web.py:1559
+msgid "New Password was send to your email address"
+msgstr "새 비밀번호가 이메일로 전송되었습니다"
+
+#: cps/web.py:1565
+msgid "Please enter valid username to reset password"
+msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
+
+#: cps/web.py:1572
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr "로그인을 할 수 없음: '%(nickname)s"
+
+#: cps/web.py:1638 cps/web.py:1687
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s 프로필"
+
+#: cps/web.py:1654
+msgid "Profile updated"
+msgstr "프로필이 업데이트 됨"
+
+#: cps/services/gmail.py:58
+msgid "Found no valid gmail.json file with OAuth information"
+msgstr "인증 정보가 포함된 유효한 gmail.json 파일을 찾을 수 없습니다"
+
+#: cps/tasks/convert.py:137
+#, python-format
+msgid "Calibre ebook-convert %(tool)s not found"
+msgstr "Calibre ebook-convert %(tool)s을(를) 찾을 수 없습니다"
+
+#: cps/tasks/convert.py:163
+#, python-format
+msgid "%(format)s format not found on disk"
+msgstr "%(format)s 형식을 찾을 수 없습니다"
+
+#: cps/tasks/convert.py:167
+msgid "Ebook converter failed with unknown error"
+msgstr "알 수 없는 오류로 인해 전자책 변환이 실패했습니다"
+
+#: cps/tasks/convert.py:177
+#, python-format
+msgid "Kepubify-converter failed: %(error)s"
+msgstr "Kepubify 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:199
+#, python-format
+msgid "Converted file not found or more than one file in folder %(folder)s"
+msgstr "변환된 파일을 찾을 수 없거나 %(folder)s 폴더에 하나 이상의 파일이 존재합니다"
+
+#: cps/tasks/convert.py:222
+#, python-format
+msgid "Ebook-converter failed: %(error)s"
+msgstr "\"전자책 변환 실패: %(error)s"
+
+#: cps/tasks/convert.py:245
+#, python-format
+msgid "Calibre failed with error: %(error)s"
+msgstr "오류로 인한 Calibre 실패: %(error)s"
+
+#: cps/templates/admin.html:9
+msgid "Users"
+msgstr "사용자"
+
+#: cps/templates/admin.html:13 cps/templates/login.html:9
+#: cps/templates/login.html:10 cps/templates/register.html:9
+#: cps/templates/user_edit.html:10 cps/templates/user_table.html:134
+msgid "Username"
+msgstr "사용자명"
+
+#: cps/templates/admin.html:14 cps/templates/register.html:14
+#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
+msgid "E-mail Address"
+msgstr "이메일 주소"
+
+#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
+msgid "Send to Kindle E-mail Address"
+msgstr "킨들로 보내기 이메일 주소"
+
+#: cps/templates/admin.html:17 cps/templates/layout.html:76
+#: cps/templates/user_table.html:143
+msgid "Admin"
+msgstr "관리자"
+
+#: cps/templates/admin.html:18 cps/templates/login.html:13
+#: cps/templates/login.html:14 cps/templates/user_edit.html:23
+msgid "Password"
+msgstr "비밀번호"
+
+#: cps/templates/admin.html:20 cps/templates/layout.html:66
+#: cps/templates/user_table.html:145
+msgid "Upload"
+msgstr "업로드"
+
+#: cps/templates/admin.html:22 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/user_table.html:146
+msgid "Download"
+msgstr "다운로드"
+
+#: cps/templates/admin.html:23
+msgid "View Books"
+msgstr "책 보기"
+
+#: cps/templates/admin.html:24 cps/templates/user_table.html:131
+#: cps/templates/user_table.html:148
+msgid "Edit"
+msgstr "편집"
+
+#: cps/templates/admin.html:25 cps/templates/book_edit.html:16
+#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
+#: cps/templates/user_table.html:149
+msgid "Delete"
+msgstr "삭제"
+
+#: cps/templates/admin.html:26
+msgid "Public Shelf"
+msgstr "공개 책장"
+
+#: cps/templates/admin.html:51
+msgid "Add New User"
+msgstr "사용자 추가"
+
+#: cps/templates/admin.html:53
+msgid "Import LDAP Users"
+msgstr "LDAP 사용자 가져오기"
+
+#: cps/templates/admin.html:60
+msgid "E-mail Server Settings"
+msgstr "이메일 서버 설정"
+
+#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+msgid "SMTP Hostname"
+msgstr "SMTP Hostname"
+
+#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+msgid "SMTP Port"
+msgstr "SMTP Port"
+
+#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+msgid "Encryption"
+msgstr "암호화"
+
+#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+msgid "SMTP Login"
+msgstr "SMTP Login"
+
+#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/email_edit.html:55
+msgid "From E-mail"
+msgstr "From E-mail"
+
+#: cps/templates/admin.html:88
+msgid "E-Mail Service"
+msgstr "E-Mail Service"
+
+#: cps/templates/admin.html:89
+msgid "Gmail via Oauth2"
+msgstr "Gmail via Oauth2"
+
+#: cps/templates/admin.html:104
+msgid "Configuration"
+msgstr "환경 설정"
+
+#: cps/templates/admin.html:107
+msgid "Calibre Database Directory"
+msgstr "Calibre DB 폴더"
+
+#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+msgid "Log Level"
+msgstr "Log Level"
+
+#: cps/templates/admin.html:115
+msgid "Port"
+msgstr "Port"
+
+#: cps/templates/admin.html:120
+msgid "External Port"
+msgstr "External Port"
+
+#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+msgid "Books per Page"
+msgstr "페이지당 보여 줄 책 수"
+
+#: cps/templates/admin.html:131
+msgid "Uploads"
+msgstr "업로드"
+
+#: cps/templates/admin.html:135
+msgid "Anonymous Browsing"
+msgstr "익명 보기"
+
+#: cps/templates/admin.html:139
+msgid "Public Registration"
+msgstr "공개 등록"
+
+#: cps/templates/admin.html:143
+msgid "Magic Link Remote Login"
+msgstr "Magic Link Remote Login"
+
+#: cps/templates/admin.html:147
+msgid "Reverse Proxy Login"
+msgstr "Reverse Proxy Login"
+
+#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+msgid "Reverse Proxy Header Name"
+msgstr "Reverse Proxy Header Name"
+
+#: cps/templates/admin.html:157
+msgid "Edit Calibre Database Configuration"
+msgstr "Calibre Database 환경 설정 편집"
+
+#: cps/templates/admin.html:158
+msgid "Edit Basic Configuration"
+msgstr "기본 환경 설정 편집"
+
+#: cps/templates/admin.html:159
+msgid "Edit UI Configuration"
+msgstr "UI 환경 설정 편집"
+
+#: cps/templates/admin.html:164
+msgid "Administration"
+msgstr "관리"
+
+#: cps/templates/admin.html:165
+msgid "Download Debug Package"
+msgstr "Debug Package 다운로드"
+
+#: cps/templates/admin.html:166
+msgid "View Logs"
+msgstr "로그 보기"
+
+#: cps/templates/admin.html:169
+msgid "Reconnect Calibre Database"
+msgstr "Calibre DB 다시 연결"
+
+#: cps/templates/admin.html:170
+msgid "Restart"
+msgstr "재시작"
+
+#: cps/templates/admin.html:171
+msgid "Shutdown"
+msgstr "종료"
+
+#: cps/templates/admin.html:176
+msgid "Update"
+msgstr "업데이트"
+
+#: cps/templates/admin.html:180
+msgid "Version"
+msgstr "버전"
+
+#: cps/templates/admin.html:181
+msgid "Details"
+msgstr "세부 정보"
+
+#: cps/templates/admin.html:187
+msgid "Current version"
+msgstr "현재 버전"
+
+#: cps/templates/admin.html:195
+msgid "Check for Update"
+msgstr "업데이트 확인"
+
+#: cps/templates/admin.html:196
+msgid "Perform Update"
+msgstr "업데이트 실행"
+
+#: cps/templates/admin.html:209
+msgid "Are you sure you want to restart?"
+msgstr "재시작을 하시겠습니까?"
+
+#: cps/templates/admin.html:214 cps/templates/admin.html:228
+#: cps/templates/admin.html:248 cps/templates/config_db.html:70
+#: cps/templates/shelf.html:96
+msgid "OK"
+msgstr "예"
+
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
+#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
+#: cps/templates/modal_dialogs.html:135 cps/templates/shelf.html:97
+#: cps/templates/shelf_edit.html:27 cps/templates/user_edit.html:144
+msgid "Cancel"
+msgstr "취소"
+
+#: cps/templates/admin.html:227
+msgid "Are you sure you want to shutdown?"
+msgstr "종료를 하시겠습니까?"
+
+#: cps/templates/admin.html:239
+msgid "Updating, please do not reload this page"
+msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
+
+#: cps/templates/author.html:15
+msgid "via"
+msgstr "via"
+
+#: cps/templates/author.html:23
+msgid "In Library"
+msgstr "In Library"
+
+#: cps/templates/author.html:26 cps/templates/index.html:72
+#: cps/templates/search.html:29 cps/templates/shelf.html:17
+msgid "Sort according to book date, newest first"
+msgstr "책 목록 정렬, 최신순"
+
+#: cps/templates/author.html:27 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:18
+msgid "Sort according to book date, oldest first"
+msgstr "책 목록 정렬, 오래된 순"
+
+#: cps/templates/author.html:28 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:19
+msgid "Sort title in alphabetical order"
+msgstr "가나다 순 정렬"
+
+#: cps/templates/author.html:29 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:20
+msgid "Sort title in reverse alphabetical order"
+msgstr "가나다 역순 정렬"
+
+#: cps/templates/author.html:30 cps/templates/index.html:78
+#: cps/templates/search.html:35 cps/templates/shelf.html:23
+msgid "Sort according to publishing date, newest first"
+msgstr "발행일 순으로 정렬, 최신순"
+
+#: cps/templates/author.html:31 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:24
+msgid "Sort according to publishing date, oldest first"
+msgstr "발행일 순으로 정렬, 오래된 순"
+
+#: cps/templates/author.html:57 cps/templates/author.html:117
+#: cps/templates/discover.html:30 cps/templates/index.html:29
+#: cps/templates/index.html:111 cps/templates/search.html:65
+#: cps/templates/shelf.html:52
+msgid "reduce"
+msgstr "reduce"
+
+#: cps/templates/author.html:101
+msgid "More by"
+msgstr "More by"
+
+#: cps/templates/book_edit.html:10
+msgid "Delete Book"
+msgstr "책 삭제"
+
+#: cps/templates/book_edit.html:13
+msgid "Delete formats:"
+msgstr "유형 삭제:"
+
+#: cps/templates/book_edit.html:24
+msgid "Convert book format:"
+msgstr "책 유형 변경:"
+
+#: cps/templates/book_edit.html:29
+msgid "Convert from:"
+msgstr "변경전 유형:"
+
+#: cps/templates/book_edit.html:31 cps/templates/book_edit.html:38
+msgid "select an option"
+msgstr "옵션 선택"
+
+#: cps/templates/book_edit.html:36
+msgid "Convert to:"
+msgstr "변경후 유형:"
+
+#: cps/templates/book_edit.html:45
+msgid "Convert book"
+msgstr "책 변경"
+
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:8
+msgid "Book Title"
+msgstr "책 제목"
+
+#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270
+#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12
+msgid "Author"
+msgstr "저자"
+
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153
+msgid "Description"
+msgstr "책 소개"
+
+#: cps/templates/book_edit.html:72
+msgid "Identifiers"
+msgstr "식별자"
+
+#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299
+msgid "Identifier Type"
+msgstr "식별자 유형"
+
+#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300
+msgid "Identifier Value"
+msgstr "식별자 값"
+
+#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301
+#: cps/templates/user_table.html:24
+msgid "Remove"
+msgstr "삭제"
+
+#: cps/templates/book_edit.html:82
+msgid "Add Identifier"
+msgstr "식별자 추가"
+
+#: cps/templates/book_edit.html:86 cps/templates/search_form.html:51
+msgid "Tags"
+msgstr "태그"
+
+#: cps/templates/book_edit.html:94
+msgid "Series ID"
+msgstr "시리즈 ID"
+
+#: cps/templates/book_edit.html:98
+msgid "Rating"
+msgstr "평점"
+
+#: cps/templates/book_edit.html:103
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
+msgstr "URL로 표지 추가(JPEG - 이미지를 다운로드 하여 DB에 저장합니다)"
+
+#: cps/templates/book_edit.html:107
+msgid "Upload Cover from Local Disk"
+msgstr "로컬 디스크에서 표지 업로드"
+
+#: cps/templates/book_edit.html:112
+msgid "Published Date"
+msgstr "출간일"
+
+#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:289 cps/templates/detail.html:164
+#: cps/templates/search_form.html:16
+msgid "Publisher"
+msgstr "출판사"
+
+#: cps/templates/book_edit.html:125 cps/templates/detail.html:131
+#: cps/templates/user_edit.html:33
+msgid "Language"
+msgstr "언어"
+
+#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45
+#: cps/templates/search_form.html:164
+msgid "Yes"
+msgstr "예"
+
+#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46
+#: cps/templates/search_form.html:165
+msgid "No"
+msgstr "아니오"
+
+#: cps/templates/book_edit.html:200
+msgid "Upload Format"
+msgstr "업로드 유형"
+
+#: cps/templates/book_edit.html:208
+msgid "View Book on Save"
+msgstr "저장 후 책 보기"
+
+#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229
+msgid "Fetch Metadata"
+msgstr "메타정보 가져오기"
+
+#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
+#: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
+msgid "Save"
+msgstr "저장"
+
+#: cps/templates/book_edit.html:232
+msgid "Keyword"
+msgstr "키워드"
+
+#: cps/templates/book_edit.html:233
+msgid "Search keyword"
+msgstr "키워드 검색"
+
+#: cps/templates/book_edit.html:239
+msgid "Click the cover to load metadata to the form"
+msgstr "표지를 클릭하여 양식에 메타데이터 로드"
+
+#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285
+msgid "Loading..."
+msgstr "불러오는 중..."
+
+#: cps/templates/book_edit.html:250 cps/templates/layout.html:63
+#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34
+#: cps/templates/user_edit.html:163
+msgid "Close"
+msgstr "닫기"
+
+#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291
+msgid "Source"
+msgstr "출처"
+
+#: cps/templates/book_edit.html:286
+msgid "Search error!"
+msgstr "오류 검색!"
+
+#: cps/templates/book_edit.html:287
+msgid "No Result(s) found! Please try another keyword."
+msgstr "검색 결과가 없습니다! 다른 키워드를 시도하십시오."
+
+#: cps/templates/book_table.html:12 cps/templates/book_table.html:69
+#: cps/templates/user_table.html:14 cps/templates/user_table.html:77
+#: cps/templates/user_table.html:100
+msgid "This Field is Required"
+msgstr "이 필드는 필수 항목입니다"
+
+#: cps/templates/book_table.html:37
+msgid "Merge selected books"
+msgstr "선택한 책 병합"
+
+#: cps/templates/book_table.html:38 cps/templates/user_table.html:124
+msgid "Remove Selections"
+msgstr "선택 제거"
+
+#: cps/templates/book_table.html:41
+msgid "Exchange author and title"
+msgstr "저자 및 제목 교환"
+
+#: cps/templates/book_table.html:47
+msgid "Update Title Sort automatically"
+msgstr "자동으로 제목 정렬 업데이트"
+
+#: cps/templates/book_table.html:51
+msgid "Update Author Sort automatically"
+msgstr "자동으로 작성자 정렬 업데이트"
+
+#: cps/templates/book_table.html:63 cps/templates/book_table.html:69
+msgid "Enter Title"
+msgstr "제목 입력"
+
+#: cps/templates/book_table.html:63 cps/templates/config_view_edit.html:24
+#: cps/templates/shelf_edit.html:8
+msgid "Title"
+msgstr "제목"
+
+#: cps/templates/book_table.html:64
+msgid "Enter Title Sort"
+msgstr "제목 정렬 입력"
+
+#: cps/templates/book_table.html:64
+msgid "Title Sort"
+msgstr "제목 정렬"
+
+#: cps/templates/book_table.html:65
+msgid "Enter Author Sort"
+msgstr "저자 정렬 입력"
+
+#: cps/templates/book_table.html:65
+msgid "Author Sort"
+msgstr "저자 정렬"
+
+#: cps/templates/book_table.html:66
+msgid "Enter Authors"
+msgstr "저자 입력"
+
+#: cps/templates/book_table.html:67
+msgid "Enter Categories"
+msgstr "카테고리 입력"
+
+#: cps/templates/book_table.html:68
+msgid "Enter Series"
+msgstr "시리즈 입력"
+
+#: cps/templates/book_table.html:69
+msgid "Series Index"
+msgstr "시리즈 색인"
+
+#: cps/templates/book_table.html:70
+msgid "Enter Languages"
+msgstr "언어 입력"
+
+#: cps/templates/book_table.html:71
+msgid "Publishing Date"
+msgstr "출간일"
+
+#: cps/templates/book_table.html:72
+msgid "Enter Publishers"
+msgstr "출판사 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Enter comments"
+msgstr "코멘트 입력"
+
+#: cps/templates/book_table.html:73
+msgid "Comments"
+msgstr "코멘트"
+
+#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
+#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
+#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
+#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+msgid "Enter "
+msgstr "입력 "
+
+#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+msgid "Are you really sure?"
+msgstr "정말 확신합니까?"
+
+#: cps/templates/book_table.html:114
+msgid "Books with Title will be merged from:"
+msgstr "제목이 있는 책은 다음에서 병합됨:"
+
+#: cps/templates/book_table.html:118
+msgid "Into Book with Title:"
+msgstr "제목이 있는 책으로:"
+
+#: cps/templates/book_table.html:123
+msgid "Merge"
+msgstr "병합"
+
+#: cps/templates/config_db.html:12
+msgid "Location of Calibre Database"
+msgstr "Calibre Database 위치"
+
+#: cps/templates/config_db.html:22
+msgid "Use Google Drive?"
+msgstr "Google 드라이브를 사용하시겠습니까?"
+
+#: cps/templates/config_db.html:27
+msgid "Authenticate Google Drive"
+msgstr "구글 드라이브 인증"
+
+#: cps/templates/config_db.html:32
+msgid "Google Drive Calibre folder"
+msgstr "Google Drive Calibre 폴더"
+
+#: cps/templates/config_db.html:40
+msgid "Metadata Watch Channel ID"
+msgstr "Metadata Watch Channel ID"
+
+#: cps/templates/config_db.html:43
+msgid "Revoke"
+msgstr "취소"
+
+#: cps/templates/config_db.html:68
+msgid "New db location is invalid, please enter valid path"
+msgstr "잘못된 새 DB 위치. 올바른 경로 입력 필요"
+
+#: cps/templates/config_edit.html:18
+msgid "Server Configuration"
+msgstr "서버 구성"
+
+#: cps/templates/config_edit.html:25
+msgid "Server Port"
+msgstr "Server Port"
+
+#: cps/templates/config_edit.html:28
+msgid "SSL certfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 인증서 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:35
+msgid "SSL Keyfile location (leave it empty for non-SSL Servers)"
+msgstr "SSL 키 파일 위치(비 SSL 서버의 경우 비워 둡니다)"
+
+#: cps/templates/config_edit.html:43
+msgid "Update Channel"
+msgstr "업데이트 취소"
+
+#: cps/templates/config_edit.html:45
+msgid "Stable"
+msgstr "안정버전"
+
+#: cps/templates/config_edit.html:46
+msgid "Nightly"
+msgstr "실험버전"
+
+#: cps/templates/config_edit.html:50
+msgid "Trusted Hosts (Comma Separated)"
+msgstr "신뢰할 수 있는 호스트(쉼표로 구분)"
+
+#: cps/templates/config_edit.html:61
+msgid "Logfile Configuration"
+msgstr "Logfile 설정"
+
+#: cps/templates/config_edit.html:77
+msgid "Location and name of logfile (calibre-web.log for no entry)"
+msgstr "로그 파일의 위치 및 이름(항목이 없는 경우 calibre-web.log)"
+
+#: cps/templates/config_edit.html:82
+msgid "Enable Access Log"
+msgstr "액세스 로그 활성화"
+
+#: cps/templates/config_edit.html:85
+msgid "Location and name of access logfile (access.log for no entry)"
+msgstr "액세스 로그 파일의 위치 및 이름(항목이 없는 경우 access.log)"
+
+#: cps/templates/config_edit.html:96
+msgid "Feature Configuration"
+msgstr "기능 설정"
+
+#: cps/templates/config_edit.html:104
+msgid "Convert non-English characters in title and author while saving to disk"
+msgstr "제목과 저자가 영어가 아닌 경우 원어로 저장하기"
+
+#: cps/templates/config_edit.html:108
+msgid "Enable Uploads"
+msgstr "업로드 활성화"
+
+#: cps/templates/config_edit.html:108
+msgid "(Please ensure users having also upload rights)"
+msgstr "(사용자에게 업로드 권한도 있는지 확인하십시오)"
+
+#: cps/templates/config_edit.html:112
+msgid "Allowed Upload Fileformats"
+msgstr "허용된 업로드 파일 형식"
+
+#: cps/templates/config_edit.html:118
+msgid "Enable Anonymous Browsing"
+msgstr "익명 탐색 활성화"
+
+#: cps/templates/config_edit.html:122
+msgid "Enable Public Registration"
+msgstr "공개 등록 활성화"
+
+#: cps/templates/config_edit.html:127
+msgid "Use E-Mail as Username"
+msgstr "이메일을 사용자 이름으로 사용"
+
+#: cps/templates/config_edit.html:132
+msgid "Enable Magic Link Remote Login"
+msgstr "Enable Magic Link Remote Login"
+
+#: cps/templates/config_edit.html:137
+msgid "Enable Kobo sync"
+msgstr "Kobo sync 활성화"
+
+#: cps/templates/config_edit.html:142
+msgid "Proxy unknown requests to Kobo Store"
+msgstr "Kobo Store에 알 수 없는 요청 프록시"
+
+#: cps/templates/config_edit.html:145
+msgid "Server External Port (for port forwarded API calls)"
+msgstr "서버 외부 포트(포트 전달 API 호출용)"
+
+#: cps/templates/config_edit.html:153
+msgid "Use Goodreads"
+msgstr "Goodreads 사용"
+
+#: cps/templates/config_edit.html:154
+msgid "Create an API Key"
+msgstr "API 키 생성"
+
+#: cps/templates/config_edit.html:158
+msgid "Goodreads API Key"
+msgstr "Goodreads API Key"
+
+#: cps/templates/config_edit.html:162
+msgid "Goodreads API Secret"
+msgstr "Goodreads API Secret"
+
+#: cps/templates/config_edit.html:169
+msgid "Allow Reverse Proxy Authentication"
+msgstr "역방향 프록시 인증 허용"
+
+#: cps/templates/config_edit.html:180
+msgid "Login type"
+msgstr "로그인 유형"
+
+#: cps/templates/config_edit.html:182
+msgid "Use Standard Authentication"
+msgstr "표준 인증 사용"
+
+#: cps/templates/config_edit.html:184
+msgid "Use LDAP Authentication"
+msgstr "LDAP 인증 사용"
+
+#: cps/templates/config_edit.html:187
+msgid "Use OAuth"
+msgstr "OAuth 사용"
+
+#: cps/templates/config_edit.html:194
+msgid "LDAP Server Host Name or IP Address"
+msgstr "LDAP 서버 호스트 이름 또는 IP 주소"
+
+#: cps/templates/config_edit.html:198
+msgid "LDAP Server Port"
+msgstr "LDAP 서버 포트"
+
+#: cps/templates/config_edit.html:202
+msgid "LDAP Encryption"
+msgstr "LDAP 암호화"
+
+#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
+#: cps/templates/email_edit.html:41
+msgid "None"
+msgstr "None"
+
+#: cps/templates/config_edit.html:205
+msgid "TLS"
+msgstr "TLS"
+
+#: cps/templates/config_edit.html:206
+msgid "SSL"
+msgstr "SSL"
+
+#: cps/templates/config_edit.html:210
+msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP CACertificate 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:217
+msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 인증서 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:224
+msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
+msgstr "LDAP 키 파일 경로(클라이언트 인증서 인증에만 필요)"
+
+#: cps/templates/config_edit.html:233
+msgid "LDAP Authentication"
+msgstr "LDAP 인증"
+
+#: cps/templates/config_edit.html:235
+msgid "Anonymous"
+msgstr "익명"
+
+#: cps/templates/config_edit.html:236
+msgid "Unauthenticated"
+msgstr "인증되지 않음"
+
+#: cps/templates/config_edit.html:237
+msgid "Simple"
+msgstr "Simple"
+
+#: cps/templates/config_edit.html:242
+msgid "LDAP Administrator Username"
+msgstr "LDAP 관리자 사용자 이름"
+
+#: cps/templates/config_edit.html:248
+msgid "LDAP Administrator Password"
+msgstr "LDAP 관리자 비밀번호"
+
+#: cps/templates/config_edit.html:253
+msgid "LDAP Distinguished Name (DN)"
+msgstr "LDAP 고유 이름(DN)"
+
+#: cps/templates/config_edit.html:257
+msgid "LDAP User Object Filter"
+msgstr "LDAP 사용자 개체 필터"
+
+#: cps/templates/config_edit.html:262
+msgid "LDAP Server is OpenLDAP?"
+msgstr "LDAP 서버는 OpenLDAP입니까?"
+
+#: cps/templates/config_edit.html:264
+msgid "Following Settings are Needed For User Import"
+msgstr "사용자 가져오기에는 다음 설정이 필요"
+
+#: cps/templates/config_edit.html:266
+msgid "LDAP Group Object Filter"
+msgstr "LDAP 그룹 개체 필터"
+
+#: cps/templates/config_edit.html:270
+msgid "LDAP Group Name"
+msgstr "DAP 그룹 이름"
+
+#: cps/templates/config_edit.html:274
+msgid "LDAP Group Members Field"
+msgstr "LDAP 그룹 구성원 필드"
+
+#: cps/templates/config_edit.html:278
+msgid "LDAP Member User Filter Detection"
+msgstr "LDAP 구성원 사용자 필터 감지"
+
+#: cps/templates/config_edit.html:280
+msgid "Autodetect"
+msgstr "자동 감지"
+
+#: cps/templates/config_edit.html:281
+msgid "Custom Filter"
+msgstr "맞춤 필터"
+
+#: cps/templates/config_edit.html:286
+msgid "LDAP Member User Filter"
+msgstr "LDAP 구성원 사용자 필터"
+
+#: cps/templates/config_edit.html:297
+#, python-format
+msgid "Obtain %(provider)s OAuth Credential"
+msgstr "%(provider)s OAuth 자격 증명 얻기"
+
+#: cps/templates/config_edit.html:300
+#, python-format
+msgid "%(provider)s OAuth Client Id"
+msgstr "%(provider)s OAuth 클라이언트 ID"
+
+#: cps/templates/config_edit.html:304
+#, python-format
+msgid "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 클라이언트 암호"
+
+#: cps/templates/config_edit.html:320
+msgid "External binaries"
+msgstr "외부 바이너리"
+
+#: cps/templates/config_edit.html:326
+msgid "Path to Calibre E-Book Converter"
+msgstr "Calibre E-Book 변환기 경로"
+
+#: cps/templates/config_edit.html:334
+msgid "Calibre E-Book Converter Settings"
+msgstr "Calibre E-Book 변환기 경로 설정"
+
+#: cps/templates/config_edit.html:337
+msgid "Path to Kepubify E-Book Converter"
+msgstr "Kepubify 전자책 변환기 경로"
+
+#: cps/templates/config_edit.html:345
+msgid "Location of Unrar binary"
+msgstr "Unrar 바이너리의 위치"
+
+#: cps/templates/config_view_edit.html:17
+msgid "View Configuration"
+msgstr "환경 설정 보기"
+
+#: cps/templates/config_view_edit.html:32
+msgid "No. of Random Books to Display"
+msgstr "랜덤 보기시 표시할 책 수"
+
+#: cps/templates/config_view_edit.html:36
+msgid "No. of Authors to Display Before Hiding (0=Disable Hiding)"
+msgstr "숨기기 전에 표시할 저자 수(0=숨기기 비활성화)"
+
+#: cps/templates/config_view_edit.html:40 cps/templates/readcbr.html:113
+msgid "Theme"
+msgstr "테마"
+
+#: cps/templates/config_view_edit.html:42
+msgid "Standard Theme"
+msgstr "기본 테마"
+
+#: cps/templates/config_view_edit.html:43
+msgid "caliBlur! Dark Theme"
+msgstr "caliBlur! 다크 모드"
+
+#: cps/templates/config_view_edit.html:47
+msgid "Regular Expression for Ignoring Columns"
+msgstr "열을 무시하는 정규식"
+
+#: cps/templates/config_view_edit.html:51
+msgid "Link Read/Unread Status to Calibre Column"
+msgstr "읽음/읽지 않음 상태를 Calibre 열에 연결"
+
+#: cps/templates/config_view_edit.html:60
+msgid "View Restrictions based on Calibre column"
+msgstr "Calibre 열을 기반으로 한 보기 제한"
+
+#: cps/templates/config_view_edit.html:69
+msgid "Regular Expression for Title Sorting"
+msgstr "제목 정렬을 위한 정규식"
+
+#: cps/templates/config_view_edit.html:80
+msgid "Default Settings for New Users"
+msgstr "새 사용자를 위한 기본 설정"
+
+#: cps/templates/config_view_edit.html:88 cps/templates/user_edit.html:96
+msgid "Admin User"
+msgstr "관리자"
+
+#: cps/templates/config_view_edit.html:92 cps/templates/user_edit.html:101
+msgid "Allow Downloads"
+msgstr "다운로드 허용"
+
+#: cps/templates/config_view_edit.html:96 cps/templates/user_edit.html:105
+msgid "Allow eBook Viewer"
+msgstr "책 보기 허용"
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:110
+msgid "Allow Uploads"
+msgstr "업로드 허용"
+
+#: cps/templates/config_view_edit.html:106 cps/templates/user_edit.html:115
+msgid "Allow Edit"
+msgstr "편집 허용"
+
+#: cps/templates/config_view_edit.html:111 cps/templates/user_edit.html:120
+msgid "Allow Delete Books"
+msgstr "책 삭제 허용"
+
+#: cps/templates/config_view_edit.html:116 cps/templates/user_edit.html:126
+msgid "Allow Changing Password"
+msgstr "비밀번호 변경 허용"
+
+#: cps/templates/config_view_edit.html:120 cps/templates/user_edit.html:130
+msgid "Allow Editing Public Shelves"
+msgstr "공개 서재 편집 허용"
+
+#: cps/templates/config_view_edit.html:123
+msgid "Default Language"
+msgstr "기본 언어"
+
+#: cps/templates/config_view_edit.html:131
+msgid "Default Visible Language of Books"
+msgstr "책의 기본 표시 언어"
+
+#: cps/templates/config_view_edit.html:147
+msgid "Default Visibilities for New Users"
+msgstr "신규 사용자를 위한 기본 기능"
+
+#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:84
+#: cps/templates/user_table.html:154
+msgid "Show Random Books in Detail View"
+msgstr "상세 보기에서 임의의 책 표시"
+
+#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+msgid "Add Allowed/Denied Tags"
+msgstr "허용/거부 태그 추가"
+
+#: cps/templates/config_view_edit.html:166
+msgid "Add Allowed/Denied custom column values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/detail.html:60 cps/templates/detail.html:69
+msgid "Read in Browser"
+msgstr "부라우저에서 보기"
+
+#: cps/templates/detail.html:77 cps/templates/detail.html:94
+msgid "Listen in Browser"
+msgstr "브라우저에서 듣기"
+
+#: cps/templates/detail.html:124
+#, python-format
+msgid "Book %(index)s of %(range)s"
+msgstr "책 %(index)s의 %(range)s"
+
+#: cps/templates/detail.html:173
+msgid "Published"
+msgstr "출간일"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Unread"
+msgstr "읽지 않은 상태로 표시"
+
+#: cps/templates/detail.html:221
+msgid "Mark As Read"
+msgstr "읽은 상태로 표시"
+
+#: cps/templates/detail.html:222
+msgid "Read"
+msgstr "읽기"
+
+#: cps/templates/detail.html:231
+msgid "Restore from archive"
+msgstr "아카이브에서 복원"
+
+#: cps/templates/detail.html:231
+msgid "Add to archive"
+msgstr "아카이브에 추가"
+
+#: cps/templates/detail.html:232
+msgid "Archived"
+msgstr "보관됨"
+
+#: cps/templates/detail.html:243
+msgid "Description:"
+msgstr "설명:"
+
+#: cps/templates/detail.html:256 cps/templates/search.html:14
+msgid "Add to shelf"
+msgstr "서재에 추가"
+
+#: cps/templates/detail.html:267 cps/templates/detail.html:284
+#: cps/templates/feed.xml:79 cps/templates/layout.html:137
+#: cps/templates/search.html:20
+msgid "(Public)"
+msgstr "(공개)"
+
+#: cps/templates/detail.html:298
+msgid "Edit Metadata"
+msgstr "메타저오 편집"
+
+#: cps/templates/email_edit.html:13
+msgid "Choose Server Type"
+msgstr "서버 유형 선택"
+
+#: cps/templates/email_edit.html:15
+msgid "Use Standard E-Mail Account"
+msgstr "표준 이메일 계정 사용"
+
+#: cps/templates/email_edit.html:16
+msgid "Gmail Account with OAuth2 Verification"
+msgstr "OAuth2 인증이 있는 Gmail 계정"
+
+#: cps/templates/email_edit.html:22
+msgid "Setup Gmail Account as E-Mail Server"
+msgstr "Gmail 계정을 이메일 서버로 설정"
+
+#: cps/templates/email_edit.html:24
+msgid "Revoke Gmail Access"
+msgstr "Gmail 액세스 취소"
+
+#: cps/templates/email_edit.html:42
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: cps/templates/email_edit.html:43
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#: cps/templates/email_edit.html:51
+msgid "SMTP Password"
+msgstr "SMTP 비밀번호"
+
+#: cps/templates/email_edit.html:58
+msgid "Attachment Size Limit"
+msgstr "첨부 파일 크기 제한"
+
+#: cps/templates/email_edit.html:66
+msgid "Save and Send Test E-mail"
+msgstr "저장 후 테스트 이메일 보내기"
+
+#: cps/templates/email_edit.html:70 cps/templates/layout.html:29
+#: cps/templates/shelf_order.html:42 cps/templates/user_table.html:174
+msgid "Back"
+msgstr "뒤로"
+
+#: cps/templates/email_edit.html:74
+msgid "Allowed Domains (Whitelist)"
+msgstr "허용하는 도메인(화이트 리스트)"
+
+#: cps/templates/email_edit.html:78 cps/templates/email_edit.html:105
+msgid "Add Domain"
+msgstr "도메인 추가"
+
+#: cps/templates/email_edit.html:81 cps/templates/email_edit.html:108
+#: cps/templates/user_table.html:27
+msgid "Add"
+msgstr "추가"
+
+#: cps/templates/email_edit.html:86 cps/templates/email_edit.html:96
+msgid "Enter domainname"
+msgstr "도메인 입력"
+
+#: cps/templates/email_edit.html:92
+msgid "Denied Domains (Blacklist)"
+msgstr "거부 도메인(블랙리스트)"
+
+#: cps/templates/feed.xml:21 cps/templates/layout.html:170
+msgid "Next"
+msgstr "다음"
+
+#: cps/templates/generate_kobo_auth_url.html:5
+msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
+msgstr "텍스트 편집기에서 .kobo/Kobo eReader.conf 파일을 열고 다음을 추가(또는 편집):"
+
+#: cps/templates/http_error.html:31
+msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
+msgstr "Calibre-Web Instance가 구성되지 않았습니다. 관리자에게 문의"
+
+#: cps/templates/http_error.html:41
+msgid "Create Issue"
+msgstr "이슈 생성"
+
+#: cps/templates/http_error.html:48
+msgid "Return to Home"
+msgstr "홈으로"
+
+#: cps/templates/http_error.html:50
+msgid "Logout User"
+msgstr "로그아웃"
+
+#: cps/templates/index.html:69
+msgid "Sort ascending according to download count"
+msgstr "다운로드 횟수에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:70
+msgid "Sort descending according to download count"
+msgstr "다운로드 횟수에 따라 내림차순 정렬"
+
+#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/shelf.html:21
+msgid "Sort authors in alphabetical order"
+msgstr "저자를 가나다순(알파벳순)으로 정렬"
+
+#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/shelf.html:22
+msgid "Sort authors in reverse alphabetical order"
+msgstr "저자를 가나다(알파벳) 역순으로 정렬"
+
+#: cps/templates/index.html:81
+msgid "Sort ascending according to series index"
+msgstr "시리즈 인덱스에 따라 오름차순 정렬"
+
+#: cps/templates/index.html:82
+msgid "Sort descending according to series index"
+msgstr "시리즈 인덱스에 따라 내림차순 정렬"
+
+#: cps/templates/index.xml:6
+msgid "Start"
+msgstr "시작"
+
+#: cps/templates/index.xml:18
+msgid "Alphabetical Books"
+msgstr "가나다(알파벳) 순"
+
+#: cps/templates/index.xml:22
+msgid "Books sorted alphabetically"
+msgstr "가나다(알파벳)순으로 정렬한 책"
+
+#: cps/templates/index.xml:29
+msgid "Popular publications from this catalog based on Downloads."
+msgstr "다운로드 기준 인기 도서."
+
+#: cps/templates/index.xml:36
+msgid "Popular publications from this catalog based on Rating."
+msgstr "별점 기준 인기 도서."
+
+#: cps/templates/index.xml:39
+msgid "Recently added Books"
+msgstr "최근 추가된 도서"
+
+#: cps/templates/index.xml:43
+msgid "The latest Books"
+msgstr "최신 도서"
+
+#: cps/templates/index.xml:46
+msgid "Random Books"
+msgstr "랜덤 정렬"
+
+#: cps/templates/index.xml:73
+msgid "Books ordered by Author"
+msgstr "저자별 정렬"
+
+#: cps/templates/index.xml:80
+msgid "Books ordered by publisher"
+msgstr "출판사별 정렬"
+
+#: cps/templates/index.xml:87
+msgid "Books ordered by category"
+msgstr "카테고리별 정렬"
+
+#: cps/templates/index.xml:94
+msgid "Books ordered by series"
+msgstr "시리즈별 정렬"
+
+#: cps/templates/index.xml:101
+msgid "Books ordered by Languages"
+msgstr "언어별 정렬"
+
+#: cps/templates/index.xml:108
+msgid "Books ordered by Rating"
+msgstr "평점별 정렬"
+
+#: cps/templates/index.xml:116
+msgid "Books ordered by file formats"
+msgstr "파일 종류별 정렬"
+
+#: cps/templates/index.xml:119 cps/templates/layout.html:135
+#: cps/templates/search_form.html:87
+msgid "Shelves"
+msgstr "서재"
+
+#: cps/templates/index.xml:123
+msgid "Books organized in shelves"
+msgstr "서재별 정렬"
+
+#: cps/templates/layout.html:29
+msgid "Home"
+msgstr "홈"
+
+#: cps/templates/layout.html:35
+msgid "Toggle Navigation"
+msgstr "탐색 활성화"
+
+#: cps/templates/layout.html:46
+msgid "Search Library"
+msgstr "검색"
+
+#: cps/templates/layout.html:63 cps/templates/layout.html:117
+msgid "Uploading..."
+msgstr "업로드 중..."
+
+#: cps/templates/layout.html:63
+msgid "Error"
+msgstr "오류"
+
+#: cps/templates/layout.html:63
+msgid "Upload done, processing, please wait..."
+msgstr "업로드 완료, 처리 중입니다. 잠시만 기다려 주십시오..."
+
+#: cps/templates/layout.html:76 cps/templates/read.html:72
+#: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108
+msgid "Settings"
+msgstr "설정"
+
+#: cps/templates/layout.html:78
+msgid "Account"
+msgstr "계정"
+
+#: cps/templates/layout.html:80
+msgid "Logout"
+msgstr "로그아웃"
+
+#: cps/templates/layout.html:118
+msgid "Please do not refresh the page"
+msgstr "페이지를 새로고침 하지 마세요"
+
+#: cps/templates/layout.html:128
+msgid "Browse"
+msgstr "탐색"
+
+#: cps/templates/layout.html:141 cps/templates/stats.html:3
+msgid "About"
+msgstr "서재 정보"
+
+#: cps/templates/layout.html:155
+msgid "Previous"
+msgstr "이전"
+
+#: cps/templates/layout.html:182
+msgid "Book Details"
+msgstr "책 상세정보"
+
+#: cps/templates/login.html:18
+msgid "Remember Me"
+msgstr "로그인 유지"
+
+#: cps/templates/login.html:23
+msgid "Forgot Password?"
+msgstr "비밀번호를 잊으셨나요?"
+
+#: cps/templates/login.html:26
+msgid "Log in with Magic Link"
+msgstr "Magic Link로 로그인"
+
+#: cps/templates/logviewer.html:6
+msgid "Show Calibre-Web Log: "
+msgstr "Calibre-Web 로그 표시: "
+
+#: cps/templates/logviewer.html:8
+msgid "Calibre-Web Log: "
+msgstr "Calibre-Web 로그: "
+
+#: cps/templates/logviewer.html:8
+msgid "Stream output, can't be displayed"
+msgstr "스트림 출력, 표시할 수 없음"
+
+#: cps/templates/logviewer.html:12
+msgid "Show Access Log: "
+msgstr "액세스 로그 표시: "
+
+#: cps/templates/logviewer.html:18
+msgid "Download Calibre-Web Log"
+msgstr "Calibre-Web 로그 다운로드"
+
+#: cps/templates/logviewer.html:21
+msgid "Download Access Log"
+msgstr "Access Log 다운로드"
+
+#: cps/templates/modal_dialogs.html:6
+msgid "Select Allowed/Denied Tags"
+msgstr "허용/거부 태그 선택"
+
+#: cps/templates/modal_dialogs.html:7
+msgid "Select Allowed/Denied Custom Column Values"
+msgstr "허용/거부 사용자 정의 열 값 선택"
+
+#: cps/templates/modal_dialogs.html:8
+msgid "Select Allowed/Denied Tags of User"
+msgstr "사용자의 허용/거부 태그 선택"
+
+#: cps/templates/modal_dialogs.html:9
+msgid "Select Allowed/Denied Custom Column Values of User"
+msgstr "사용자의 사용자 정의 열 값 허용/거부 선택"
+
+#: cps/templates/modal_dialogs.html:15
+msgid "Enter Tag"
+msgstr "태그 입력"
+
+#: cps/templates/modal_dialogs.html:24
+msgid "Add View Restriction"
+msgstr "보기 제한 추가"
+
+#: cps/templates/modal_dialogs.html:50
+msgid "This book format will be permanently erased from database"
+msgstr "이 책 형식은 데이터베이스에서 영구적으로 삭제됨"
+
+#: cps/templates/modal_dialogs.html:51
+msgid "This book will be permanently erased from database"
+msgstr "이 책은 데이터베이스에서 영구적으로 삭제됨"
+
+#: cps/templates/modal_dialogs.html:52
+msgid "and hard disk"
+msgstr "그리고 하드디스크"
+
+#: cps/templates/modal_dialogs.html:56
+msgid "Important Kobo Note: deleted books will remain on any paired Kobo device."
+msgstr "Kobo 참고 사항: 삭제된 책은 페어링된 모든 Kobo 기기에 남아 있습니다."
+
+#: cps/templates/modal_dialogs.html:57
+msgid "Books must first be archived and the device synced before a book can safely be deleted."
+msgstr "책을 안전하게 삭제하려면 먼저 책을 보관하고 기기를 동기화해야 합니다."
+
+#: cps/templates/modal_dialogs.html:76
+msgid "Choose File Location"
+msgstr "파일 위치 선택"
+
+#: cps/templates/modal_dialogs.html:82
+msgid "type"
+msgstr "유형"
+
+#: cps/templates/modal_dialogs.html:83
+msgid "name"
+msgstr "이름"
+
+#: cps/templates/modal_dialogs.html:84
+msgid "size"
+msgstr "크기"
+
+#: cps/templates/modal_dialogs.html:90
+msgid "Parent Directory"
+msgstr "상위 폴더"
+
+#: cps/templates/modal_dialogs.html:98
+msgid "Select"
+msgstr "선택"
+
+#: cps/templates/modal_dialogs.html:134
+msgid "Ok"
+msgstr "Ok"
+
+#: cps/templates/osd.xml:5
+msgid "Calibre-Web eBook Catalog"
+msgstr "Calibre-Web 책 목록"
+
+#: cps/templates/read.html:6
+msgid "epub Reader"
+msgstr "epub 리더"
+
+#: cps/templates/read.html:75
+msgid "Reflow text when sidebars are open."
+msgstr "사이드바가 열려 있을 때 텍스트 다시 배열."
+
+#: cps/templates/readcbr.html:7
+msgid "Comic Reader"
+msgstr "코믹 리더"
+
+#: cps/templates/readcbr.html:89
+msgid "Keyboard Shortcuts"
+msgstr "키보드 단축키"
+
+#: cps/templates/readcbr.html:92
+msgid "Previous Page"
+msgstr "이전 페이지"
+
+#: cps/templates/readcbr.html:93 cps/templates/readcbr.html:162
+msgid "Next Page"
+msgstr "다음 페이지"
+
+#: cps/templates/readcbr.html:94
+msgid "Scale to Best"
+msgstr "최적 크기"
+
+#: cps/templates/readcbr.html:95
+msgid "Scale to Width"
+msgstr "폭 조절"
+
+#: cps/templates/readcbr.html:96
+msgid "Scale to Height"
+msgstr "높이 조절"
+
+#: cps/templates/readcbr.html:97
+msgid "Scale to Native"
+msgstr "기본 크기"
+
+#: cps/templates/readcbr.html:98
+msgid "Rotate Right"
+msgstr "오른쪽으로 회전"
+
+#: cps/templates/readcbr.html:99
+msgid "Rotate Left"
+msgstr "왼쪽으로 회전"
+
+#: cps/templates/readcbr.html:100
+msgid "Flip Image"
+msgstr "이미지 뒤집기"
+
+#: cps/templates/readcbr.html:116
+msgid "Light"
+msgstr "밝게"
+
+#: cps/templates/readcbr.html:117
+msgid "Dark"
+msgstr "어둡게"
+
+#: cps/templates/readcbr.html:122
+msgid "Scale"
+msgstr "크기"
+
+#: cps/templates/readcbr.html:125
+msgid "Best"
+msgstr "최적"
+
+#: cps/templates/readcbr.html:126
+msgid "Width"
+msgstr "폭"
+
+#: cps/templates/readcbr.html:127
+msgid "Height"
+msgstr "높이"
+
+#: cps/templates/readcbr.html:128
+msgid "Native"
+msgstr "기본"
+
+#: cps/templates/readcbr.html:133
+msgid "Rotate"
+msgstr "회전"
+
+#: cps/templates/readcbr.html:144
+msgid "Flip"
+msgstr "뒤집기"
+
+#: cps/templates/readcbr.html:147
+msgid "Horizontal"
+msgstr "수평"
+
+#: cps/templates/readcbr.html:148
+msgid "Vertical"
+msgstr "수직"
+
+#: cps/templates/readcbr.html:153
+msgid "Direction"
+msgstr "방향"
+
+#: cps/templates/readcbr.html:156
+msgid "Left to Right"
+msgstr "왼쪽에서 오른쪽"
+
+#: cps/templates/readcbr.html:157
+msgid "Right to Left"
+msgstr "오른쪽에서 왼쪽"
+
+#: cps/templates/readcbr.html:165
+msgid "Reset to Top"
+msgstr "맨 위로 재설정"
+
+#: cps/templates/readcbr.html:166
+msgid "Remember Position"
+msgstr "위치 기억"
+
+#: cps/templates/readcbr.html:171
+msgid "Scrollbar"
+msgstr "스크롤바"
+
+#: cps/templates/readcbr.html:174
+msgid "Show"
+msgstr "보기"
+
+#: cps/templates/readcbr.html:175
+msgid "Hide"
+msgstr "숨기기"
+
+#: cps/templates/readdjvu.html:5
+msgid "DJVU Reader"
+msgstr "DJVU 리더"
+
+#: cps/templates/readpdf.html:29
+msgid "PDF Reader"
+msgstr "PDF 리더"
+
+#: cps/templates/readtxt.html:6
+msgid "txt Reader"
+msgstr "텍스트 리더"
+
+#: cps/templates/register.html:4
+msgid "Register New Account"
+msgstr "새 계정 등록"
+
+#: cps/templates/register.html:10
+msgid "Choose a username"
+msgstr "사용자 이름 선택"
+
+#: cps/templates/register.html:15
+msgid "Your email address"
+msgstr "이메일 주소"
+
+#: cps/templates/remote_login.html:5
+msgid "Magic Link - Authorise New Device"
+msgstr "Magic Link - 새 장치 승인"
+
+#: cps/templates/remote_login.html:7
+msgid "On another device, login and visit:"
+msgstr "다른 기기에서는 로그인 하고 방문:"
+
+#: cps/templates/remote_login.html:11
+msgid "Once verified, you will automatically be logged in on this device."
+msgstr "승인이 되면 이 장치에 자동으로 로그인됩니다."
+
+#: cps/templates/remote_login.html:14
+msgid "This verification link will expire in 10 minutes."
+msgstr "이 확인 링크는 10분 후에 만료됩니다."
+
+#: cps/templates/search.html:5
+msgid "No Results Found"
+msgstr "결과 없음"
+
+#: cps/templates/search.html:6
+msgid "Search Term:"
+msgstr "검색어:"
+
+#: cps/templates/search.html:8
+msgid "Results for:"
+msgstr "결과:"
+
+#: cps/templates/search_form.html:21
+msgid "Published Date From"
+msgstr "출간일(부터)"
+
+#: cps/templates/search_form.html:31
+msgid "Published Date To"
+msgstr "출간일(까지)"
+
+#: cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "읽은 상태"
+
+#: cps/templates/search_form.html:59
+msgid "Exclude Tags"
+msgstr "태그 제외"
+
+#: cps/templates/search_form.html:77
+msgid "Exclude Series"
+msgstr "시리즈 제외"
+
+#: cps/templates/search_form.html:95
+msgid "Exclude Shelves"
+msgstr "서재 제외"
+
+#: cps/templates/search_form.html:115
+msgid "Exclude Languages"
+msgstr "언어 제외"
+
+#: cps/templates/search_form.html:126
+msgid "Extensions"
+msgstr "확장자"
+
+#: cps/templates/search_form.html:134
+msgid "Exclude Extensions"
+msgstr "확장자 제외"
+
+#: cps/templates/search_form.html:144
+msgid "Rating Above"
+msgstr "평점(이상)"
+
+#: cps/templates/search_form.html:148
+msgid "Rating Below"
+msgstr "평점(이하)"
+
+#: cps/templates/search_form.html:180
+msgid "From:"
+msgstr "부터:"
+
+#: cps/templates/search_form.html:190
+msgid "To:"
+msgstr "까지:"
+
+#: cps/templates/shelf.html:11
+msgid "Delete this Shelf"
+msgstr "이 서재 삭제"
+
+#: cps/templates/shelf.html:12
+msgid "Edit Shelf Properties"
+msgstr "서재 속성 편집"
+
+#: cps/templates/shelf.html:14
+msgid "Arrange books manually"
+msgstr "수동으로 책 정렬"
+
+#: cps/templates/shelf.html:15
+msgid "Disable Change order"
+msgstr "정렬 변경 비활성화"
+
+#: cps/templates/shelf.html:15
+msgid "Enable Change order"
+msgstr "정렬 변경 활성화"
+
+#: cps/templates/shelf.html:94
+msgid "Shelf will be deleted for all users"
+msgstr "모든 사용자의 서가가 삭제됨"
+
+#: cps/templates/shelf_edit.html:14
+msgid "Share with Everyone"
+msgstr "모두와 공유"
+
+#: cps/templates/shelf_edit.html:21
+msgid "Sync this shelf with Kobo device"
+msgstr "이 서재를 Kobo 기기와 동기화"
+
+#: cps/templates/shelf_order.html:5
+msgid "Drag to Rearrange Order"
+msgstr "드래그하여 순서 변경"
+
+#: cps/templates/shelf_order.html:33
+msgid "Hidden Book"
+msgstr "숨겨진 책"
+
+#: cps/templates/stats.html:7
+msgid "Library Statistics"
+msgstr "Calibre 서재 통계"
+
+#: cps/templates/stats.html:12
+msgid "Books in this Library"
+msgstr "이 서재의 책들"
+
+#: cps/templates/stats.html:16
+msgid "Authors in this Library"
+msgstr "이 서재의 저자"
+
+#: cps/templates/stats.html:20
+msgid "Categories in this Library"
+msgstr "이 서재의 카테고리"
+
+#: cps/templates/stats.html:24
+msgid "Series in this Library"
+msgstr "이 서재의 시리즈"
+
+#: cps/templates/stats.html:29
+msgid "System Statistics"
+msgstr "시스템 통계"
+
+#: cps/templates/stats.html:33
+msgid "Program Library"
+msgstr "서재 프로그램"
+
+#: cps/templates/stats.html:34
+msgid "Installed Version"
+msgstr "설치 버전"
+
+#: cps/templates/tasks.html:12
+msgid "User"
+msgstr "사용자"
+
+#: cps/templates/tasks.html:14
+msgid "Task"
+msgstr "작업"
+
+#: cps/templates/tasks.html:15
+msgid "Status"
+msgstr "상태"
+
+#: cps/templates/tasks.html:16
+msgid "Progress"
+msgstr "Progress"
+
+#: cps/templates/tasks.html:17
+msgid "Run Time"
+msgstr "실행 시간"
+
+#: cps/templates/tasks.html:18
+msgid "Start Time"
+msgstr "시작 시간"
+
+#: cps/templates/user_edit.html:20
+msgid "Reset user Password"
+msgstr "사용자 비밀번호 초기화"
+
+#: cps/templates/user_edit.html:43
+msgid "Language of Books"
+msgstr "책 언어"
+
+#: cps/templates/user_edit.html:54
+msgid "OAuth Settings"
+msgstr "OAuth 설정"
+
+#: cps/templates/user_edit.html:56
+msgid "Link"
+msgstr "링크"
+
+#: cps/templates/user_edit.html:58
+msgid "Unlink"
+msgstr "링크 해제"
+
+#: cps/templates/user_edit.html:64
+msgid "Kobo Sync Token"
+msgstr "코보 연동 토큰"
+
+#: cps/templates/user_edit.html:66
+msgid "Create/View"
+msgstr "생성/보기"
+
+#: cps/templates/user_edit.html:70
+msgid "Force full kobo sync"
+msgstr "강제로 코보 전체 동기화"
+
+#: cps/templates/user_edit.html:88
+msgid "Add allowed/Denied Custom Column Values"
+msgstr "허용/거부 사용자 정의 열 값 추가"
+
+#: cps/templates/user_edit.html:137
+msgid "Sync only books in selected shelves with Kobo"
+msgstr "선택한 서가에 있는 책만 Kobo와 동기화"
+
+#: cps/templates/user_edit.html:147 cps/templates/user_table.html:169
+msgid "Delete User"
+msgstr "사용자 삭제"
+
+#: cps/templates/user_edit.html:159
+msgid "Generate Kobo Auth URL"
+msgstr "Kobo Auth URL 생성"
+
+#: cps/templates/user_table.html:80 cps/templates/user_table.html:103
+msgid "Select..."
+msgstr "선택..."
+
+#: cps/templates/user_table.html:131
+msgid "Edit User"
+msgstr "사용자 편집"
+
+#: cps/templates/user_table.html:134
+msgid "Enter Username"
+msgstr "사용자 이름"
+
+#: cps/templates/user_table.html:135
+msgid "Enter E-mail Address"
+msgstr "이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Enter Kindle E-mail Address"
+msgstr "킨들 이메일 주소 입력"
+
+#: cps/templates/user_table.html:136
+msgid "Kindle E-mail"
+msgstr "킨들 이메일"
+
+#: cps/templates/user_table.html:137
+msgid "Locale"
+msgstr "언어"
+
+#: cps/templates/user_table.html:138
+msgid "Visible Book Languages"
+msgstr "표시할 책 언어"
+
+#: cps/templates/user_table.html:139
+msgid "Edit Allowed Tags"
+msgstr "허용된 태그 편집"
+
+#: cps/templates/user_table.html:139
+msgid "Allowed Tags"
+msgstr "허용된 태그"
+
+#: cps/templates/user_table.html:140
+msgid "Edit Denied Tags"
+msgstr "거부된 태그 편집"
+
+#: cps/templates/user_table.html:140
+msgid "Denied Tags"
+msgstr "거부된 태그"
+
+#: cps/templates/user_table.html:141
+msgid "Edit Allowed Column Values"
+msgstr "허용된 열 값 편집"
+
+#: cps/templates/user_table.html:141
+msgid "Allowed Column Values"
+msgstr "허용되는 열 값"
+
+#: cps/templates/user_table.html:142
+msgid "Edit Denied Column Values"
+msgstr "거부된 열 값 편집"
+
+#: cps/templates/user_table.html:142
+msgid "Denied Column Values"
+msgstr "거부된 열 값"
+
+#: cps/templates/user_table.html:144
+msgid "Change Password"
+msgstr "비밀번호 변경"
+
+#: cps/templates/user_table.html:147
+msgid "View"
+msgstr "보기"
+
+#: cps/templates/user_table.html:150
+msgid "Edit Public Shelves"
+msgstr "공개 서재 편집"
+
+#: cps/templates/user_table.html:152
+msgid "Sync selected Shelves with Kobo"
+msgstr "선택한 서재를 코보와 동기화"
+
+#: cps/templates/user_table.html:156
+msgid "Show read/unread selection"
+msgstr "읽음/읽지 않음 선택 표시"
+
+#: cps/templates/user_table.html:159
+msgid "Show random books"
+msgstr "랜덤 보기 표시"

From e3dbf7a88dd34b7c2a07ca8b538d1874c6a3c05f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 7 Jan 2022 12:40:03 +0100
Subject: [PATCH 051/220] Bugfixes load metadata Improvements for testing load
 metadata

---
 cps/metadata_provider/comicvine.py |  2 +-
 cps/metadata_provider/google.py    |  2 +-
 cps/static/js/get_meta.js          |  2 +-
 cps/templates/book_edit.html       | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 00c34599..45e5f341 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -36,7 +36,7 @@ class ComicVine(Metadata):
 
             result = requests.get("https://comicvine.gamespot.com/api/search?api_key="
                                   + apikey + "&resources=issue&query=" + query + "&sort=name:desc&format=json", headers=headers)
-            for r in result.json()['results']:
+            for r in result.json().get('results'):
                 seriesTitle = r['volume'].get('name', "")
                 if r.get('store_date'):
                     dateFomers = r.get('store_date')
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index cf166f2e..1bc8185b 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -30,7 +30,7 @@ class Google(Metadata):
         if self.active:
             val = list()
             result = requests.get("https://www.googleapis.com/books/v1/volumes?q="+query.replace(" ","+"))
-            for r in result.json()['items']:
+            for r in result.json().get('items'):
                 v = dict()
                 v['id'] = r['id']
                 v['title'] = r['volumeInfo'].get('title',"")
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 2ad4d53b..aab767a2 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -40,7 +40,7 @@ $(function () {
         $("#book_title").val(book.title);
         $("#tags").val(uniqueTags.join(", "));
         $("#rating").data("rating").setValue(Math.round(book.rating));
-        if(book.cover){
+        if(book.cover && $("#cover_url").length){
             $(".cover img").attr("src", book.cover);
             $("#cover_url").val(book.cover);
         }
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 9d2ac14e..57470858 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -247,7 +247,7 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
+        <button id="meta_close" type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
       </div>
     </div>
   </div>
@@ -265,17 +265,17 @@
     >
     <div class="media-body">
       <h4 class="media-heading">
-        <a href="<%= url %>" target="_blank" rel="noopener"><%= title %></a>
+        <a class="meta_title" href="<%= url %>" target="_blank" rel="noopener"><%= title %></a>
       </h4>
-      <p>{{_('Author')}}：<%= authors.join(" & ") %></p>
+      <p class="meta_author">{{_('Author')}}：<%= authors.join(" & ") %></p>
       <% if (publisher) { %>
-        <p>{{_('Publisher')}}：<%= publisher %></p>
+        <p class="meta_publisher">{{_('Publisher')}}：<%= publisher %></p>
       <% } %>
       <% if (description) { %>
-        <p>{{_('Description')}}: <%= description %></p>
+        <p class="meta_description">{{_('Description')}}: <%= description %></p>
       <% } %>
       <p>{{_('Source')}}:
-        <a href="<%= source.link %>" target="_blank" rel="noopener"><%= source.description %></a>
+        <a class="meta_source" href="<%= source.link %>" target="_blank" rel="noopener"><%= source.description %></a>
       </p>
     </div>
   </li>

From df670795731e7568462869b815f4eb39da1bb41a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 8 Jan 2022 14:24:31 +0100
Subject: [PATCH 052/220] Fixes for kobosync with multiple users (#2230)

---
 cps/editbooks.py        |  2 +-
 cps/kobo.py             | 32 +++++++++++++++-----------------
 cps/kobo_sync_status.py | 10 +++++++---
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index e20cfcfb..18248416 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -836,7 +836,7 @@ def edit_book(book_id):
 
             if modif_date:
                 book.last_modified = datetime.utcnow()
-                kobo_sync_status.remove_synced_book(edited_books_id)
+                kobo_sync_status.remove_synced_book(edited_books_id, all=True)
 
             calibre_db.session.merge(book)
             calibre_db.session.commit()
diff --git a/cps/kobo.py b/cps/kobo.py
index c74a3230..706056d3 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -173,10 +173,10 @@ def HandleSyncRequest():
                                                        ub.BookShelf.date_added,
                                                        ub.ArchivedBook.is_archived)
         changed_entries = (changed_entries
-                .join(db.Data).outerjoin(ub.ArchivedBook, db.Books.id == ub.ArchivedBook.book_id)
-                .join(ub.KoboSyncedBooks, ub.KoboSyncedBooks.book_id == db.Books.id, isouter=True)
-                .filter(or_(ub.KoboSyncedBooks.user_id != current_user.id,
-                            ub.KoboSyncedBooks.book_id == None))
+                           .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                                          ub.ArchivedBook.user_id == current_user.id))
+                           .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
+                                           .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
                 .filter(ub.BookShelf.date_added > sync_token.books_last_modified)
                 .filter(db.Data.format.in_(KOBO_FORMATS))
                 .filter(calibre_db.common_filters(allow_show_archived=True))
@@ -196,11 +196,11 @@ def HandleSyncRequest():
                                                        ub.ArchivedBook.last_modified,
                                                        ub.ArchivedBook.is_archived)
         changed_entries = (changed_entries
-                   .join(db.Data).outerjoin(ub.ArchivedBook, db.Books.id == ub.ArchivedBook.book_id)
-                   .join(ub.KoboSyncedBooks, ub.KoboSyncedBooks.book_id == db.Books.id, isouter=True)
-                   .filter(or_(ub.KoboSyncedBooks.user_id != current_user.id,
-                               ub.KoboSyncedBooks.book_id == None))
-                   .filter(calibre_db.common_filters())
+                   .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                                  ub.ArchivedBook.user_id == current_user.id))
+                   .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
+                                              .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
+                   .filter(calibre_db.common_filters(allow_show_archived=True))
                    .filter(db.Data.format.in_(KOBO_FORMATS))
                    .order_by(db.Books.last_modified)
                    .order_by(db.Books.id)
@@ -257,10 +257,12 @@ def HandleSyncRequest():
     if sqlalchemy_version2:
         max_change = calibre_db.session.execute(changed_entries
                                                 .filter(ub.ArchivedBook.is_archived)
+                                                .filter(ub.ArchivedBook.user_id == current_user.id)
                                                 .order_by(func.datetime(ub.ArchivedBook.last_modified).desc()))\
             .columns(db.Books).first()
     else:
-        max_change = changed_entries.from_self().filter(ub.ArchivedBook.is_archived) \
+        max_change = changed_entries.from_self().filter(ub.ArchivedBook.is_archived)\
+            .filter(ub.ArchivedBook.user_id==current_user.id) \
             .order_by(func.datetime(ub.ArchivedBook.last_modified).desc()).first()
 
     max_change = max_change.last_modified if max_change else new_archived_last_modified
@@ -339,7 +341,7 @@ def generate_sync_response(sync_token, sync_results, set_cont=False):
         extra_headers["x-kobo-sync"] = "continue"
     sync_token.to_headers(extra_headers)
 
-    log.debug("Kobo Sync Content: {}".format(sync_results))
+    # log.debug("Kobo Sync Content: {}".format(sync_results))
     # jsonify decodes the unicode string different to what kobo expects
     response = make_response(json.dumps(sync_results), extra_headers)
     response.headers["Content-Type"] = "application/json; charset=utf-8"
@@ -671,11 +673,8 @@ def HandleTagRemoveItem(tag_id):
 # Note: Public shelves that aren't owned by the user aren't supported.
 def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
     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
-    ):
+    # transmit all archived shelfs independent of last sync (why should this matter?)
+    for shelf in ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id):
         new_tags_last_modified = max(shelf.last_modified, new_tags_last_modified)
         sync_results.append({
             "DeletedTag": {
@@ -688,7 +687,6 @@ def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
         ub.session.delete(shelf)
         ub.session_commit()
 
-
     extra_filters = []
     if only_kobo_shelves:
         for shelf in ub.session.query(ub.Shelf).filter(
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index eee47d89..a22ec165 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -20,7 +20,7 @@
 from flask_login import current_user
 from . import ub
 import datetime
-from sqlalchemy.sql.expression import or_, and_
+from sqlalchemy.sql.expression import or_, and_, true
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -36,9 +36,13 @@ def add_synced_books(book_id):
 
 
 # Select all entries of current book in kobo_synced_books table, which are from current user and delete them
-def remove_synced_book(book_id):
+def remove_synced_book(book_id, all=False):
+    if not all:
+        user = ub.KoboSyncedBooks.user_id == current_user.id
+    else:
+        user = true()
     ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id) \
-        .filter(ub.KoboSyncedBooks.user_id == current_user.id).delete()
+        .filter(user).delete()
     ub.session_commit()
 
 

From 96b1e8960ba9b2e50aeeed6690ed676a4194aa04 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 9 Jan 2022 12:55:38 +0100
Subject: [PATCH 053/220] Bugfix send to kindle with multiple formats

---
 cps/templates/detail.html               |    2 +-
 optional-requirements.txt               |    2 +-
 setup.cfg                               |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1479 ++++++++++++++++-------
 4 files changed, 1058 insertions(+), 427 deletions(-)

diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 1fd5f09a..c8d7d527 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -41,7 +41,7 @@
                 <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=kindle_list[0]['format'], convert=kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{kindle_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
-                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle postAction" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <span class="glyphicon glyphicon-send"></span>{{_('Send to Kindle')}}
                     <span class="caret"></span>
                   </button>
diff --git a/optional-requirements.txt b/optional-requirements.txt
index b90951aa..2368be10 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -22,7 +22,7 @@ goodreads>=0.3.2,<0.4.0
 python-Levenshtein>=0.12.0,<0.13.0
 
 # ldap login
-python-ldap>=3.0.0,<3.4.0
+python-ldap>=3.0.0,<3.5.0
 Flask-SimpleLDAP>=1.4.0,<1.5.0
 
 #oauth
diff --git a/setup.cfg b/setup.cfg
index a81102b8..52f1d813 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,7 +75,7 @@ goodreads =
     goodreads>=0.3.2,<0.4.0
     python-Levenshtein>=0.12.0,<0.13.0
 ldap =
-    python-ldap>=3.0.0,<3.4.0
+    python-ldap>=3.0.0,<3.5.0
     Flask-SimpleLDAP>=1.4.0,<1.5.0
 oauth =
     Flask-Dance>=2.0.0,<5.2.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 511300be..8b724a93 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-02 17:11:15</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-08 19:04:30</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>2022-01-02 21:33:59</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-08 22:45:06</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>3h 43 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 0 min</p>
         </div>
       </div>
       </div>
@@ -411,45 +411,25 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEbookConvertCalibre</td>
-        <td class="text-center">15</td>
-        <td class="text-center">14</td>
+        <td class="text-center">18</td>
+        <td class="text-center">12</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 15)">Detail</a>
+            <a onclick="showClassDetail('c6', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft6.1" class="none bg-danger">
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 643, in test_calibre_log
-    self.assertTrue(&#34; …&#34; in data)
-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>
     
     
@@ -553,29 +533,210 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id="ft6.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</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_ft6.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
+    self.assertTrue(conv)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id="et6.14" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et6.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</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_et6.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 458, in test_starttls_smtp_setup_error
+    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;, &#39;mail_password&#39;:&#39;10234&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.15' class='hiddenRow bg-success'>
+        <tr id="et6.16" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et6.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</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_et6.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 525, in test_user_convert_xss
+    self.create_user(&#39;&lt;p&gt;calibre Quick Start Guide&lt;/p&gt;&lt;img src=x onerror=alert(&#34;jo&#34;)&gt;&#39;, {&#39;password&#39;: &#39;123&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
+    ele = cls.driver.find_element_by_id(checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et6.18" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -734,11 +895,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">13</td>
-        <td class="text-center">1</td>
+        <td class="text-center">14</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
         <td class="text-center">
@@ -811,31 +972,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft10.8" class="none bg-danger">
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 657, in test_title_sort
-    self.assertEqual(7, len(self.search(&#39; book &#39;)))
-AssertionError: 7 != 6</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1277,12 +1418,12 @@ AssertionError: 7 != 6</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c12', 18)">Detail</a>
@@ -1408,11 +1549,33 @@ AssertionError: 7 != 6</pre>
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id="et12.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</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_et12.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et12.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et12.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 269, in test_bookslist_edit_seriesindex
+    bl = self.get_books_list(-1)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_books_list
+    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1454,11 +1617,11 @@ AssertionError: 7 != 6</pre>
     
 
 
-    <tr id="su" class="failClass">
-        <td>TestEditMetadata</td>
+    <tr id="su" class="passClass">
+        <td>TestLoadMetadata</td>
+        <td class="text-center">1</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1468,31 +1631,11 @@ AssertionError: 7 != 6</pre>
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditMetadata - test_upload_book_lit</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 48, in test_upload_book_lit
-    self.assertEqual(&#34;&#34;, self.check_element_on_page((By.ID, &#34;Der Buchtitel&#34;)))
-AssertionError: &#39;&#39; != False</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1694,14 +1837,14 @@ AssertionError: &#39;&#39; != False</pre>
 
 
     <tr id="su" class="passClass">
-        <td>TestSTARTTLS</td>
-        <td class="text-center">3</td>
-        <td class="text-center">3</td>
+        <td>TestLoadMetadataScholar</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c15', 3)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
@@ -1709,25 +1852,7 @@ AssertionError: &#39;&#39; != False</pre>
     
         <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt15.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt15.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
+                <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1735,79 +1860,391 @@ AssertionError: &#39;&#39; != False</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestSSL</td>
-        <td class="text-center">7</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+    <tr id="su" class="errorClass">
+        <td>TestSTARTTLS</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 7)">Detail</a>
+            <a onclick="showClassDetail('c16', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id="ft16.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 70, in test_STARTTLS
+    self.assertTrue(conv)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et16.2" class="none bg-info">
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 87, in test_STARTTLS_SSL_setup_error
+    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;SSL/TLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et16.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 106, in test_STARTTLS_resend_password
+    self.create_user(&#39;paswd_resend&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;a@b.com&#39;, &#39;edit_role&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
+    ele = cls.driver.find_element_by_id(checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestSSL</td>
+        <td class="text-center">7</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c17', 7)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="ft17.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</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_ft17.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 111, in test_SSL_None_setup_error
+    self.assertTrue(conv)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id="et17.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</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_et17.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 86, in test_SSL_STARTTLS_setup_error
+    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id="et17.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</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_et17.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 126, in test_SSL_logging_email
+    self.setup_server(True, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id="et17.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</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_et17.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 177, in test_SSL_non_admin_user
+    self.create_user(&#39;ssl_email&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;answer@beta.com&#39;, &#39;kindle_mail&#39;: &#39;answer@beta.com&#39;, &#39;download_role&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
+    ele = cls.driver.find_element_by_id(checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;download_role&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id="et17.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</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_et17.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 64, in test_SSL_only
+    self.setup_server(False, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
+    select = Select(cls.driver.find_element_by_id(key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
+    return self.find_element(by=By.ID, value=id_)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id="et17.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</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_et17.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 135, in test_email_limit
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id="et17.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</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_et17.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et17.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et17.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
+    accordions[0].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1821,13 +2258,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1845,13 +2282,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1869,13 +2306,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -1893,13 +2330,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1917,13 +2354,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1932,7 +2369,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -1941,7 +2378,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -1959,13 +2396,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 11)">Detail</a>
+            <a onclick="showClassDetail('c23', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -1974,7 +2411,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -1983,7 +2420,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -1992,7 +2429,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2001,7 +2438,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2010,7 +2447,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.6' class='hiddenRow bg-success'>
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2019,7 +2456,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.7' class='hiddenRow bg-success'>
+        <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2028,7 +2465,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.8' class='hiddenRow bg-success'>
+        <tr id='pt23.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2037,7 +2474,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.9' class='hiddenRow bg-success'>
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2046,7 +2483,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.10' class='hiddenRow bg-success'>
+        <tr id='pt23.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2055,7 +2492,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt22.11' class='hiddenRow bg-success'>
+        <tr id='pt23.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2065,21 +2502,21 @@ AssertionError: &#39;&#39; != False</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">3</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('c23', 5)">Detail</a>
+            <a onclick="showClassDetail('c24', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2088,16 +2525,38 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id="ft24.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</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_ft24.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft24.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 266, in test_kobo_sync_selected_shelfs
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 144, in inital_sync
+    self.assertEqual(24, len(data[15]))  # 120 new and 4 original books
+AssertionError: 24 != 25</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2106,16 +2565,36 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id="ft24.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</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_ft24.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 251, in test_sync_reading_state
+    self.assertEqual(len(data[1]), 5)  # 120 new and 4 original books
+AssertionError: 4 != 5</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2125,21 +2604,21 @@ AssertionError: &#39;&#39; != False</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">13</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">6</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 13)">Detail</a>
+            <a onclick="showClassDetail('c25', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2148,25 +2627,71 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id="ft25.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</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_ft25.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 618, in test_LDAP_SSL_CERTIFICATE
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id="et25.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</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_et25.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 647, in test_LDAP_STARTTLS
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message:</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2175,16 +2700,36 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id="ft25.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - 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_ft25.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 408, in test_LDAP_import
+    self.assertEqual(len(userlist), 4)
+AssertionError: 5 != 4</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2193,16 +2738,36 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id="ft25.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</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_ft25.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 229, in test_LDAP_login
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2211,7 +2776,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2220,25 +2785,65 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id="ft25.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</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_ft25.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 766, in test_ldap_authentication
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id="ft25.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</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_ft25.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1037, in test_ldap_kobo_sync
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.12' class='hiddenRow bg-success'>
+        <tr id='pt25.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2247,11 +2852,31 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt24.13' class='hiddenRow bg-success'>
+        <tr id="ft25.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLdapLogin - 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_ft25.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 849, in test_ldap_opds_download_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2265,13 +2890,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 8)">Detail</a>
+            <a onclick="showClassDetail('c26', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2280,7 +2905,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2289,7 +2914,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2298,7 +2923,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2307,7 +2932,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2316,7 +2941,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2325,7 +2950,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2334,7 +2959,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2352,13 +2977,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 9)">Detail</a>
+            <a onclick="showClassDetail('c27', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2367,7 +2992,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2376,7 +3001,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2385,7 +3010,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2394,19 +3019,19 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id="st26.5" class="none bg-warning">
+        <tr id="st27.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st27.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_st26.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st27.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2420,7 +3045,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2429,7 +3054,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2438,7 +3063,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2447,7 +3072,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2465,13 +3090,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 15)">Detail</a>
+            <a onclick="showClassDetail('c28', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2480,7 +3105,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2489,7 +3114,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2498,7 +3123,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2507,7 +3132,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2516,7 +3141,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2525,7 +3150,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2534,7 +3159,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2543,7 +3168,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2552,7 +3177,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2561,7 +3186,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2570,7 +3195,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2579,7 +3204,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2588,7 +3213,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.14' class='hiddenRow bg-success'>
+        <tr id='pt28.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2597,7 +3222,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt27.15' class='hiddenRow bg-success'>
+        <tr id='pt28.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2615,13 +3240,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 2)">Detail</a>
+            <a onclick="showClassDetail('c29', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2630,7 +3255,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2648,13 +3273,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2663,7 +3288,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2681,13 +3306,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 23)">Detail</a>
+            <a onclick="showClassDetail('c31', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2696,7 +3321,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2705,7 +3330,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2714,7 +3339,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2723,7 +3348,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2732,7 +3357,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2741,7 +3366,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2750,7 +3375,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2759,7 +3384,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2768,7 +3393,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2777,7 +3402,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2786,7 +3411,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2795,7 +3420,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2804,7 +3429,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2813,7 +3438,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2822,7 +3447,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.16' class='hiddenRow bg-success'>
+        <tr id='pt31.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2831,7 +3456,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.17' class='hiddenRow bg-success'>
+        <tr id='pt31.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2840,7 +3465,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.18' class='hiddenRow bg-success'>
+        <tr id='pt31.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2849,7 +3474,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.19' class='hiddenRow bg-success'>
+        <tr id='pt31.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2858,7 +3483,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.20' class='hiddenRow bg-success'>
+        <tr id='pt31.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2867,7 +3492,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.21' class='hiddenRow bg-success'>
+        <tr id='pt31.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2876,7 +3501,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.22' class='hiddenRow bg-success'>
+        <tr id='pt31.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2885,7 +3510,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt30.23' class='hiddenRow bg-success'>
+        <tr id='pt31.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2903,13 +3528,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 1)">Detail</a>
+            <a onclick="showClassDetail('c32', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -2927,13 +3552,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 5)">Detail</a>
+            <a onclick="showClassDetail('c33', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -2942,7 +3567,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -2951,7 +3576,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -2960,7 +3585,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -2969,7 +3594,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -2987,13 +3612,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 8)">Detail</a>
+            <a onclick="showClassDetail('c34', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3002,7 +3627,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3011,7 +3636,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3020,7 +3645,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3029,7 +3654,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3038,7 +3663,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3047,7 +3672,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3056,7 +3681,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3074,13 +3699,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3089,7 +3714,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3098,7 +3723,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3116,13 +3741,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 14)">Detail</a>
+            <a onclick="showClassDetail('c36', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3131,7 +3756,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3140,7 +3765,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3149,7 +3774,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3158,7 +3783,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3167,7 +3792,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3176,7 +3801,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.7' class='hiddenRow bg-success'>
+        <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3185,7 +3810,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3194,7 +3819,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.9' class='hiddenRow bg-success'>
+        <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3203,7 +3828,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.10' class='hiddenRow bg-success'>
+        <tr id='pt36.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3212,7 +3837,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.11' class='hiddenRow bg-success'>
+        <tr id='pt36.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3221,19 +3846,19 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id="st35.12" class="none bg-warning">
+        <tr id="st36.12" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st35.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st35.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.12" 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_st35.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3247,7 +3872,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.13' class='hiddenRow bg-success'>
+        <tr id='pt36.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3256,7 +3881,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt35.14' class='hiddenRow bg-success'>
+        <tr id='pt36.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3274,13 +3899,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 9)">Detail</a>
+            <a onclick="showClassDetail('c37', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3289,7 +3914,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3298,7 +3923,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3307,7 +3932,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3316,7 +3941,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3325,7 +3950,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3334,19 +3959,19 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id="st36.7" class="none bg-warning">
+        <tr id="st37.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.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_st36.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3360,7 +3985,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3369,7 +3994,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3387,13 +4012,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 2)">Detail</a>
+            <a onclick="showClassDetail('c38', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3402,7 +4027,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3420,13 +4045,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 18)">Detail</a>
+            <a onclick="showClassDetail('c39', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3435,7 +4060,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3444,7 +4069,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3453,7 +4078,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3462,7 +4087,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3471,7 +4096,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3480,7 +4105,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3489,7 +4114,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3498,7 +4123,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3507,7 +4132,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.10' class='hiddenRow bg-success'>
+        <tr id='pt39.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3516,7 +4141,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.11' class='hiddenRow bg-success'>
+        <tr id='pt39.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3525,7 +4150,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.12' class='hiddenRow bg-success'>
+        <tr id='pt39.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3534,7 +4159,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.13' class='hiddenRow bg-success'>
+        <tr id='pt39.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3543,7 +4168,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.14' class='hiddenRow bg-success'>
+        <tr id='pt39.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3552,7 +4177,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.15' class='hiddenRow bg-success'>
+        <tr id='pt39.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3561,7 +4186,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.16' class='hiddenRow bg-success'>
+        <tr id='pt39.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3570,7 +4195,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.17' class='hiddenRow bg-success'>
+        <tr id='pt39.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3579,7 +4204,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt38.18' class='hiddenRow bg-success'>
+        <tr id='pt39.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3597,13 +4222,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c40', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3621,13 +4246,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 21)">Detail</a>
+            <a onclick="showClassDetail('c41', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3636,7 +4261,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3645,7 +4270,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3654,7 +4279,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3663,7 +4288,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3672,7 +4297,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3681,7 +4306,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3690,7 +4315,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3699,7 +4324,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3708,7 +4333,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3717,7 +4342,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3726,7 +4351,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3735,7 +4360,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3744,7 +4369,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3753,7 +4378,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3762,7 +4387,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3771,7 +4396,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3780,7 +4405,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3789,7 +4414,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.19' class='hiddenRow bg-success'>
+        <tr id='pt41.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3798,7 +4423,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.20' class='hiddenRow bg-success'>
+        <tr id='pt41.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3807,7 +4432,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt40.21' class='hiddenRow bg-success'>
+        <tr id='pt41.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3825,13 +4450,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 34)">Detail</a>
+            <a onclick="showClassDetail('c42', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -3840,7 +4465,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -3849,7 +4474,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -3858,7 +4483,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -3867,7 +4492,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -3876,7 +4501,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -3885,7 +4510,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -3894,7 +4519,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -3903,7 +4528,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3912,7 +4537,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -3921,7 +4546,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -3930,7 +4555,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -3939,7 +4564,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -3948,7 +4573,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -3957,7 +4582,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -3966,7 +4591,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -3975,7 +4600,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -3984,7 +4609,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -3993,7 +4618,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4002,7 +4627,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4011,7 +4636,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4020,7 +4645,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.22' class='hiddenRow bg-success'>
+        <tr id='pt42.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4029,7 +4654,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.23' class='hiddenRow bg-success'>
+        <tr id='pt42.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4038,7 +4663,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.24' class='hiddenRow bg-success'>
+        <tr id='pt42.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4047,7 +4672,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.25' class='hiddenRow bg-success'>
+        <tr id='pt42.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4056,7 +4681,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.26' class='hiddenRow bg-success'>
+        <tr id='pt42.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4065,7 +4690,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.27' class='hiddenRow bg-success'>
+        <tr id='pt42.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4074,7 +4699,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.28' class='hiddenRow bg-success'>
+        <tr id='pt42.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4083,7 +4708,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.29' class='hiddenRow bg-success'>
+        <tr id='pt42.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4092,7 +4717,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.30' class='hiddenRow bg-success'>
+        <tr id='pt42.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4101,7 +4726,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.31' class='hiddenRow bg-success'>
+        <tr id='pt42.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4110,7 +4735,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.32' class='hiddenRow bg-success'>
+        <tr id='pt42.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4119,7 +4744,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.33' class='hiddenRow bg-success'>
+        <tr id='pt42.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4128,7 +4753,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt41.34' class='hiddenRow bg-success'>
+        <tr id='pt42.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4146,13 +4771,13 @@ AssertionError: &#39;&#39; != False</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c43', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4161,7 +4786,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4170,7 +4795,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4179,7 +4804,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4188,7 +4813,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4197,7 +4822,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4206,7 +4831,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4215,7 +4840,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4224,7 +4849,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4233,7 +4858,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4242,7 +4867,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4251,7 +4876,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4260,7 +4885,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4269,7 +4894,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4278,7 +4903,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4287,7 +4912,7 @@ AssertionError: &#39;&#39; != False</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4298,10 +4923,10 @@ AssertionError: &#39;&#39; != False</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>380</td>
-        <td>371</td>
-        <td>3</td>
-        <td>0</td>
+        <td>384</td>
+        <td>352</td>
+        <td>11</td>
+        <td>15</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4330,7 +4955,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-22-generic #22~20.04.1-Ubuntu SMP Tue Nov 9 15:07:24 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-23-generic #23~20.04.2-Ubuntu SMP Fri Dec 10 12:06:47 UTC 2021 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4456,7 +5081,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4486,7 +5111,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4516,7 +5141,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4558,7 +5183,7 @@ AssertionError: &#39;&#39; != False</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4586,9 +5211,15 @@ AssertionError: &#39;&#39; != False</pre>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
+            <tr>
+              <th>scholarly</th>
+              <td>1.5.1</td>
+              <td>TestLoadMetadataScholar</td>
+            </tr>
+          
             <tr>
               <th>google-api-python-client</th>
-              <td>2.33.0</td>
+              <td>2.34.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4678,7 +5309,7 @@ AssertionError: &#39;&#39; != False</pre>
 </div>
 
 <script>
-    drawCircle(371, 3, 0, 6);
+    drawCircle(352, 11, 15, 6);
     showCase(5);
 </script>
 

From 0feb62c142bac7818ff4947218e6b3789098522f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 9 Jan 2022 13:54:35 +0100
Subject: [PATCH 054/220] Improvements delete user (delete also depending
 entries in tables) Fixes kobo sync with sync only selected shelfs

---
 cps/admin.py            | 9 +++++++++
 cps/kobo.py             | 5 +++--
 cps/kobo_sync_status.py | 3 ++-
 cps/shelf.py            | 4 ++++
 cps/ub.py               | 4 ++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 29f5fb20..706dce39 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1415,7 +1415,16 @@ def _delete_user(content):
             for us in ub.session.query(ub.Shelf).filter(content.id == ub.Shelf.user_id):
                 ub.session.query(ub.BookShelf).filter(us.id == ub.BookShelf.shelf).delete()
             ub.session.query(ub.Shelf).filter(content.id == ub.Shelf.user_id).delete()
+            ub.session.query(ub.Bookmark).filter(content.id == ub.Bookmark.user_id).delete()
             ub.session.query(ub.User).filter(ub.User.id == content.id).delete()
+            ub.session.query(ub.ArchivedBook).filter(ub.ArchivedBook.user_id == content.id).delete()
+            ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == content.id).delete()
+            ub.session.query(ub.User_Sessions).filter(ub.User_Sessions.user_id == content.id).delete()
+            ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.user_id == content.id).delete()
+            # delete KoboReadingState and all it's children
+            kobo_entries = ub.session.query(ub.KoboReadingState).filter(ub.KoboReadingState.user_id == content.id).all()
+            for kobo_entry in kobo_entries:
+                ub.session.delete(kobo_entry)
             ub.session_commit()
             log.info(u"User {} deleted".format(content.name))
             return(_(u"User '%(nick)s' deleted", nick=content.name))
diff --git a/cps/kobo.py b/cps/kobo.py
index 706056d3..67304c93 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -297,7 +297,8 @@ def HandleSyncRequest():
 
     changed_reading_states = changed_reading_states.filter(
         and_(ub.KoboReadingState.user_id == current_user.id,
-             ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements)))
+             ub.KoboReadingState.book_id.notin_(reading_states_in_new_entitlements)))\
+        .order_by(ub.KoboReadingState.last_modified)
     cont_sync |= bool(changed_reading_states.count() > SYNC_ITEM_LIMIT)
     for kobo_reading_state in changed_reading_states.limit(SYNC_ITEM_LIMIT).all():
         book = calibre_db.session.query(db.Books).filter(db.Books.id == kobo_reading_state.book_id).one_or_none()
@@ -849,7 +850,7 @@ def get_ub_read_status(kobo_read_status):
 
 def get_or_create_reading_state(book_id):
     book_read = ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id,
-                                                          ub.ReadBook.user_id == current_user.id).one_or_none()
+                                                          ub.ReadBook.user_id == int(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:
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index a22ec165..6df0a503 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -60,7 +60,7 @@ def change_archived_books(book_id, state=None, message=None):
     return archived_book.is_archived
 
 
-# select all books which are synced by the current user and do not belong to a synced shelf and them to archive
+# select all books which are synced by the current user and do not belong to a synced shelf and set them to archive
 # select all shelves from current user which are synced and do not belong to the "only sync" shelves
 def update_on_sync_shelfs(user_id):
     books_to_archive = (ub.session.query(ub.KoboSyncedBooks)
@@ -75,6 +75,7 @@ def update_on_sync_shelfs(user_id):
             .filter(ub.KoboSyncedBooks.user_id == user_id).delete()
         ub.session_commit()
 
+    # Search all shelf which are currently not synced
     shelves_to_archive = ub.session.query(ub.Shelf).filter(ub.Shelf.user_id == user_id).filter(
         ub.Shelf.kobo_sync == 0).all()
     for a in shelves_to_archive:
diff --git a/cps/shelf.py b/cps/shelf.py
index b1fbdd04..29a4fe99 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -251,6 +251,10 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
         is_public = 1 if to_save.get("is_public") else 0
         if config.config_kobo_sync:
             shelf.kobo_sync = True if to_save.get("kobo_sync") else False
+            if shelf.kobo_sync:
+                ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id).filter(
+                    ub.ShelfArchive.uuid == shelf.uuid).delete()
+                ub.session_commit()
         shelf_title = to_save.get("title", "")
         if check_shelf_is_unique(shelf, shelf_title, is_public, shelf_id):
             shelf.name = shelf_title
diff --git a/cps/ub.py b/cps/ub.py
index 6b3c27ca..1d5db58a 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -421,8 +421,8 @@ class KoboReadingState(Base):
     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")
+    current_bookmark = relationship("KoboBookmark", uselist=False, backref="kobo_reading_state", cascade="all, delete")
+    statistics = relationship("KoboStatistics", uselist=False, backref="kobo_reading_state", cascade="all, delete")
 
 
 class KoboBookmark(Base):

From 8ae066c3871f91b3d4763ca387bffdbd0429902a Mon Sep 17 00:00:00 2001
From: byword77 <byword77@gmail.com>
Date: Mon, 10 Jan 2022 11:59:16 +0900
Subject: [PATCH 055/220] Add files via upload

---
 cps/translations/ko/LC_MESSAGES/messages.mo | Bin 59876 -> 59878 bytes
 cps/translations/ko/LC_MESSAGES/messages.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/translations/ko/LC_MESSAGES/messages.mo b/cps/translations/ko/LC_MESSAGES/messages.mo
index 78088664d156cd9ef12df4f5c9e1087a08a06db7..9f2b1f71c6477009db72759916f1a445a00aa4fd 100644
GIT binary patch
delta 245
zcmaEInfcje<_%wT>vb3y81_GBU{D9rZ-BG_kQRBtz#s{vRe`iPkhTZX-atAWNQ(jK
z#Xy=HNbdsDoIv^*kY)qY7l5=dkiHJ3Uqi+J18H8MINM8zIuRfZvPb$QgBe((4p4v@
zC}0evErGN-kmdl=g+N*XNLNAW*+5zo$ltShrQZ7(4nqS4LqjWLgUt)N6=Gz%m%N$V
iqwuC_&6`;(-^`ovdf^-eAbz!d$D6r3Hs5;A#RLF01w&&1

delta 243
zcmXZVzY76j7{Kv2C;5>QMQ3`;AXnrDC(2)7w)r2dHjAWKg`ya3>IRp^Vz$U;lyf>+
ztjZTxZ+&{cJx}lTs9cW9`jzi!LWrF$L>BKD!}v`I6*HK^8rHFaNnBzCEezov19-p$
zo;)3|zcEVpJO8~ne*aM&Vf+p?f<n--f+Y-M3njKar<h~jnybRI87!8iu2+kOxfsZ1
ddO5pqEO*Z9%ExFS-Tp+n<DNSonrA!g`v8@cK>Yv!

diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 35aa7c51..6640ff2f 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
 "POT-Creation-Date: 2022-01-01 17:51+0100\n"
-"PO-Revision-Date: 2022-01-07 11:06+0900\n"
+"PO-Revision-Date: 2022-01-10 11:30+0900\n"
 "Last-Translator: 내맘대로의 EPUBGUIDE.NET <byword77@gmail.com>\n"
 "Language-Team: 내맘대로의 epubguide.net <byword77@gmail.com>\n"
 "Language: ko\n"
@@ -1285,7 +1285,7 @@ msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력
 #: cps/web.py:1572
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
-msgstr "로그인을 할 수 없음: '%(nickname)s"
+msgstr "다음 사용자로 로그인: '%(nickname)s"
 
 #: cps/web.py:1638 cps/web.py:1687
 #, python-format

From 3c1f5fd37f800dffdcff64d9fc6f63240bec043e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 10 Jan 2022 17:35:18 +0100
Subject: [PATCH 056/220] Update Test results

---
 test/Calibre-Web TestSummary_Linux.html | 1696 +++++++++--------------
 1 file changed, 644 insertions(+), 1052 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 8b724a93..f1ddb0e5 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-08 19:04:30</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-09 18:09:05</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>2022-01-08 22:45:06</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-10 10:00:36</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>3h 0 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>15h 11 min</p>
         </div>
       </div>
       </div>
@@ -411,15 +411,15 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
-        <td class="text-center">18</td>
-        <td class="text-center">12</td>
-        <td class="text-center">1</td>
-        <td class="text-center">5</td>
+        <td class="text-center">15</td>
+        <td class="text-center">15</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('c6', 18)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
@@ -533,210 +533,29 @@
     
     
     
-        <tr id="ft6.13" class="none bg-danger">
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
-    self.assertTrue(conv)
-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>
     
     
     
-        <tr id="et6.14" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
-    self.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et6.15" class="none bg-info">
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 458, in test_starttls_smtp_setup_error
-    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;, &#39;mail_password&#39;:&#39;10234&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et6.16" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
-    self.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et6.17" class="none bg-info">
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 525, in test_user_convert_xss
-    self.create_user(&#39;&lt;p&gt;calibre Quick Start Guide&lt;/p&gt;&lt;img src=x onerror=alert(&#34;jo&#34;)&gt;&#39;, {&#39;password&#39;: &#39;123&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et6.18" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et6.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 69, in tearDown
-    self.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -895,12 +714,12 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">14</td>
-        <td class="text-center">0</td>
+        <td class="text-center">9</td>
         <td class="text-center">0</td>
+        <td class="text-center">5</td>
         <td class="text-center">2</td>
         <td class="text-center">
             <a onclick="showClassDetail('c10', 16)">Detail</a>
@@ -972,38 +791,164 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id="et10.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</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_et10.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 685, in test_title_sort
+    self.fill_view_config({&#39;config_title_regex&#39;: &#39;^(Beta)\s+&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 409, in fill_view_config
+    ele.clear()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 95, in clear
+    self._execute(Command.CLEAR_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_title_regex&#34; class=&#34;form-control&#34; name=&#34;config_title_regex&#34; type=&#34;text&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.9' class='hiddenRow bg-success'>
+        <tr id="et10.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</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_et10.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 526, in test_upload_edit_role
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id="et10.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</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_et10.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 55, in test_upload_metadata_cbr
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id="et10.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</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_et10.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 92, in test_upload_metadata_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1034,11 +979,45 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id="et10.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</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_et10.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 256, in test_writeonly_path
+    self.fill_view_config({&#39;config_read_column&#39;: &#34;Custom Bool 1 Ä&#34;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 414, in fill_view_config
+    select.select_by_visible_text(process_selects[key])
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 120, in select_by_visible_text
+    self._setSelected(opt)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 212, in _setSelected
+    option.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;option&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1071,6 +1050,60 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
 
 
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c11', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et11.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 41, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 445, in stop_calibre_web
+    element.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;shutdown&#34; class=&#34;btn btn-default&#34; type=&#34;button&#34;&gt; could not be scrolled into view</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
@@ -1079,13 +1112,13 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 35)">Detail</a>
+            <a onclick="showClassDetail('c12', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1094,7 +1127,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1103,7 +1136,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1112,7 +1145,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1121,7 +1154,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1130,7 +1163,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1139,7 +1172,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1148,7 +1181,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1157,7 +1190,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1166,7 +1199,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1175,7 +1208,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1184,7 +1217,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1193,7 +1226,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1202,7 +1235,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1211,7 +1244,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1220,7 +1253,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1229,7 +1262,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1238,7 +1271,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1247,7 +1280,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1256,19 +1289,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="st11.20" class="none bg-warning">
+        <tr id="st12.20" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st12.20" 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.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1282,7 +1315,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.21' class='hiddenRow bg-success'>
+        <tr id='pt12.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1291,7 +1324,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.22' class='hiddenRow bg-success'>
+        <tr id='pt12.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1300,7 +1333,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.23' class='hiddenRow bg-success'>
+        <tr id='pt12.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1309,7 +1342,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.24' class='hiddenRow bg-success'>
+        <tr id='pt12.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1318,7 +1351,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.25' class='hiddenRow bg-success'>
+        <tr id='pt12.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1327,7 +1360,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.26' class='hiddenRow bg-success'>
+        <tr id='pt12.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1336,7 +1369,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1345,7 +1378,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.28' class='hiddenRow bg-success'>
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1354,7 +1387,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.29' class='hiddenRow bg-success'>
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1363,7 +1396,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.30' class='hiddenRow bg-success'>
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1372,7 +1405,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.31' class='hiddenRow bg-success'>
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1381,7 +1414,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.32' class='hiddenRow bg-success'>
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1390,7 +1423,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.33' class='hiddenRow bg-success'>
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1399,7 +1432,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1408,7 +1441,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id='pt12.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1426,13 +1459,13 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 18)">Detail</a>
+            <a onclick="showClassDetail('c13', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1441,7 +1474,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1450,7 +1483,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1459,7 +1492,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1468,7 +1501,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1477,7 +1510,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1486,7 +1519,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt13.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1495,7 +1528,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt13.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1504,7 +1537,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt13.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1513,7 +1546,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt13.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1522,7 +1555,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt13.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1531,7 +1564,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt13.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1540,7 +1573,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt13.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1549,24 +1582,24 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="et12.14" class="none bg-info">
+        <tr id="et13.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.14')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.14')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et12.14" class="popup_window test_output" style="display:block;">
+                <div id="div_et13.14" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.14').style.display='none'"><span
+                                onclick="document.getElementById('div_et13.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 269, in test_bookslist_edit_seriesindex
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 270, in test_bookslist_edit_seriesindex
     bl = self.get_books_list(-1)
   File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_books_list
     element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
@@ -1580,7 +1613,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt13.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1589,7 +1622,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt13.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1598,7 +1631,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt13.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1607,7 +1640,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt13.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1625,13 +1658,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 1)">Detail</a>
+            <a onclick="showClassDetail('c14', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -1649,13 +1682,13 @@ IndexError: list index out of range</pre>
         <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'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1664,7 +1697,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1673,7 +1706,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1682,7 +1715,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1691,7 +1724,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1700,7 +1733,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1709,7 +1742,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1718,7 +1751,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1727,7 +1760,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1736,7 +1769,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1745,7 +1778,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1754,7 +1787,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1763,7 +1796,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1772,7 +1805,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1781,7 +1814,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1790,7 +1823,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1799,7 +1832,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1808,7 +1841,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1817,7 +1850,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.19' class='hiddenRow bg-success'>
+        <tr id='pt15.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1826,7 +1859,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt14.20' class='hiddenRow bg-success'>
+        <tr id='pt15.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1844,13 +1877,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -1860,391 +1893,121 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSTARTTLS</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">1</td>
-        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 3)">Detail</a>
+            <a onclick="showClassDetail('c17', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft16.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 70, in test_STARTTLS
-    self.assertTrue(conv)
-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>
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 87, in test_STARTTLS_SSL_setup_error
-    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;SSL/TLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.3" class="none bg-info">
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 106, in test_STARTTLS_resend_password
-    self.create_user(&#39;paswd_resend&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;a@b.com&#39;, &#39;edit_role&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</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">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 7)">Detail</a>
+            <a onclick="showClassDetail('c18', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft17.1" class="none bg-danger">
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft17.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft17.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 111, in test_SSL_None_setup_error
-    self.assertTrue(conv)
-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>
     
     
     
-        <tr id="et17.2" class="none bg-info">
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 86, in test_SSL_STARTTLS_setup_error
-    self.setup_server(False, {&#39;mail_use_ssl&#39;:&#39;STARTTLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.3" class="none bg-info">
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 126, in test_SSL_logging_email
-    self.setup_server(True, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.4" class="none bg-info">
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 177, in test_SSL_non_admin_user
-    self.create_user(&#39;ssl_email&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;answer@beta.com&#39;, &#39;kindle_mail&#39;: &#39;answer@beta.com&#39;, &#39;download_role&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 973, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1027, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;download_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.5" class="none bg-info">
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 64, in test_SSL_only
-    self.setup_server(False, {&#39;mail_use_ssl&#39;: &#39;SSL/TLS&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 687, in setup_server
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;mail_use_ssl&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.6" class="none bg-info">
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 135, in test_email_limit
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et17.7" class="none bg-info">
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et17.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et17.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et17.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
-    accordions[0].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2258,13 +2021,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2282,13 +2045,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2306,13 +2069,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2330,13 +2093,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c22', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2354,13 +2117,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2369,7 +2132,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2378,7 +2141,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2396,13 +2159,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 11)">Detail</a>
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2411,7 +2174,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2420,7 +2183,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2429,7 +2192,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2438,7 +2201,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2447,7 +2210,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2456,7 +2219,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2465,7 +2228,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2474,7 +2237,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2483,7 +2246,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.10' class='hiddenRow bg-success'>
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2492,7 +2255,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2502,21 +2265,21 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">3</td>
-        <td class="text-center">2</td>
+        <td class="text-center">5</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('c24', 5)">Detail</a>
+            <a onclick="showClassDetail('c25', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2525,38 +2288,16 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="ft24.2" class="none bg-danger">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft24.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft24.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 266, in test_kobo_sync_selected_shelfs
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 144, in inital_sync
-    self.assertEqual(24, len(data[15]))  # 120 new and 4 original books
-AssertionError: 24 != 25</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2565,36 +2306,16 @@ AssertionError: 24 != 25</pre>
     
     
     
-        <tr id="ft24.4" class="none bg-danger">
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft24.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 251, in test_sync_reading_state
-    self.assertEqual(len(data[1]), 5)  # 120 new and 4 original books
-AssertionError: 4 != 5</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2604,21 +2325,21 @@ AssertionError: 4 != 5</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">6</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</td>
+        <td class="text-center">12</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('c25', 13)">Detail</a>
+            <a onclick="showClassDetail('c26', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2627,26 +2348,23 @@ AssertionError: 4 != 5</pre>
     
     
     
-        <tr id="ft25.2" class="none bg-danger">
+        <tr id="st26.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.2')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
+                <div id="div_st26.2" 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_ft25.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st26.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 618, in test_LDAP_SSL_CERTIFICATE
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
+                        <pre class="text-left">Unknown how to test certificate</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2656,42 +2374,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="et25.3" class="none bg-info">
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 647, in test_LDAP_STARTTLS
-    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 265, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2700,36 +2392,16 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="ft25.5" class="none bg-danger">
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 408, in test_LDAP_import
-    self.assertEqual(len(userlist), 4)
-AssertionError: 5 != 4</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2738,36 +2410,16 @@ AssertionError: 5 != 4</pre>
     
     
     
-        <tr id="ft25.7" class="none bg-danger">
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 229, in test_LDAP_login
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2776,7 +2428,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2785,65 +2437,25 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft25.10" class="none bg-danger">
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 766, in test_ldap_authentication
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="ft25.11" class="none bg-danger">
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1037, in test_ldap_kobo_sync
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id='pt25.12' class='hiddenRow bg-success'>
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2852,31 +2464,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft25.13" class="none bg-danger">
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - 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_ft25.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 849, in test_ldap_opds_download_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
@@ -2890,13 +2482,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 8)">Detail</a>
+            <a onclick="showClassDetail('c27', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2905,7 +2497,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2914,7 +2506,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2923,7 +2515,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2932,7 +2524,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2941,7 +2533,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2950,7 +2542,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2959,7 +2551,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2977,13 +2569,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('c27', 9)">Detail</a>
+            <a onclick="showClassDetail('c28', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2992,7 +2584,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3001,7 +2593,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3010,7 +2602,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3019,19 +2611,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st27.5" class="none bg-warning">
+        <tr id="st28.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st27.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st28.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_st27.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st28.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3045,7 +2637,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3054,7 +2646,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3063,7 +2655,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3072,7 +2664,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3090,13 +2682,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 15)">Detail</a>
+            <a onclick="showClassDetail('c29', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3105,7 +2697,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3114,7 +2706,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3123,7 +2715,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3132,7 +2724,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3141,7 +2733,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3150,7 +2742,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3159,7 +2751,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3168,7 +2760,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3177,7 +2769,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3186,7 +2778,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3195,7 +2787,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3204,7 +2796,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3213,7 +2805,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3222,7 +2814,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3240,13 +2832,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3255,7 +2847,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3273,13 +2865,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3288,7 +2880,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3306,13 +2898,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 23)">Detail</a>
+            <a onclick="showClassDetail('c32', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3321,7 +2913,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3330,7 +2922,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3339,7 +2931,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3348,7 +2940,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3357,7 +2949,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt32.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3366,7 +2958,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt32.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3375,7 +2967,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt32.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3384,7 +2976,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt32.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3393,7 +2985,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt32.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3402,7 +2994,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt32.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3411,7 +3003,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt32.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3420,7 +3012,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt32.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3429,7 +3021,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt32.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3438,7 +3030,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt32.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3447,7 +3039,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.16' class='hiddenRow bg-success'>
+        <tr id='pt32.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3456,7 +3048,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.17' class='hiddenRow bg-success'>
+        <tr id='pt32.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3465,7 +3057,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.18' class='hiddenRow bg-success'>
+        <tr id='pt32.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3474,7 +3066,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.19' class='hiddenRow bg-success'>
+        <tr id='pt32.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3483,7 +3075,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.20' class='hiddenRow bg-success'>
+        <tr id='pt32.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3492,7 +3084,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.21' class='hiddenRow bg-success'>
+        <tr id='pt32.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3501,7 +3093,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.22' class='hiddenRow bg-success'>
+        <tr id='pt32.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3510,7 +3102,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt31.23' class='hiddenRow bg-success'>
+        <tr id='pt32.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3528,13 +3120,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 1)">Detail</a>
+            <a onclick="showClassDetail('c33', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3552,13 +3144,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 5)">Detail</a>
+            <a onclick="showClassDetail('c34', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3567,7 +3159,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3576,7 +3168,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3585,7 +3177,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3594,7 +3186,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3612,13 +3204,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 8)">Detail</a>
+            <a onclick="showClassDetail('c35', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3627,7 +3219,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3636,7 +3228,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3645,7 +3237,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3654,7 +3246,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3663,7 +3255,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt35.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3672,7 +3264,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt35.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3681,7 +3273,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt35.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3699,13 +3291,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 3)">Detail</a>
+            <a onclick="showClassDetail('c36', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3714,7 +3306,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3723,7 +3315,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3741,13 +3333,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('c36', 14)">Detail</a>
+            <a onclick="showClassDetail('c37', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3756,7 +3348,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3765,7 +3357,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3774,7 +3366,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3783,7 +3375,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3792,7 +3384,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3801,7 +3393,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.7' class='hiddenRow bg-success'>
+        <tr id='pt37.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3810,7 +3402,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3819,7 +3411,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3828,7 +3420,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.10' class='hiddenRow bg-success'>
+        <tr id='pt37.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3837,7 +3429,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.11' class='hiddenRow bg-success'>
+        <tr id='pt37.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3846,19 +3438,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st36.12" class="none bg-warning">
+        <tr id="st37.12" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.12" 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_st36.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3872,7 +3464,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.13' class='hiddenRow bg-success'>
+        <tr id='pt37.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3881,7 +3473,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt36.14' class='hiddenRow bg-success'>
+        <tr id='pt37.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3899,13 +3491,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('c37', 9)">Detail</a>
+            <a onclick="showClassDetail('c38', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3914,7 +3506,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3923,7 +3515,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3932,7 +3524,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3941,7 +3533,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3950,7 +3542,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3959,19 +3551,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st37.7" class="none bg-warning">
+        <tr id="st38.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st37.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st38.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_st37.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st38.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3985,7 +3577,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3994,7 +3586,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -4012,13 +3604,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 2)">Detail</a>
+            <a onclick="showClassDetail('c39', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4027,7 +3619,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4045,13 +3637,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 18)">Detail</a>
+            <a onclick="showClassDetail('c40', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4060,7 +3652,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4069,7 +3661,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4078,7 +3670,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4087,7 +3679,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4096,7 +3688,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4105,7 +3697,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4114,7 +3706,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4123,7 +3715,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4132,7 +3724,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4141,7 +3733,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4150,7 +3742,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4159,7 +3751,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4168,7 +3760,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4177,7 +3769,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4186,7 +3778,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4195,7 +3787,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4204,7 +3796,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4222,13 +3814,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4246,13 +3838,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 21)">Detail</a>
+            <a onclick="showClassDetail('c42', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4261,7 +3853,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4270,7 +3862,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4279,7 +3871,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4288,7 +3880,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4297,7 +3889,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4306,7 +3898,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4315,7 +3907,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4324,7 +3916,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4333,7 +3925,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4342,7 +3934,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4351,7 +3943,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4360,7 +3952,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4369,7 +3961,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4378,7 +3970,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4387,7 +3979,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4396,7 +3988,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4405,7 +3997,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4414,7 +4006,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4423,7 +4015,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4432,7 +4024,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4450,13 +4042,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 34)">Detail</a>
+            <a onclick="showClassDetail('c43', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4465,7 +4057,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4474,7 +4066,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4483,7 +4075,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4492,7 +4084,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4501,7 +4093,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4510,7 +4102,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4519,7 +4111,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4528,7 +4120,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4537,7 +4129,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4546,7 +4138,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4555,7 +4147,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4564,7 +4156,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4573,7 +4165,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4582,7 +4174,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4591,7 +4183,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4600,7 +4192,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4609,7 +4201,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4618,7 +4210,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.19' class='hiddenRow bg-success'>
+        <tr id='pt43.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4627,7 +4219,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.20' class='hiddenRow bg-success'>
+        <tr id='pt43.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4636,7 +4228,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.21' class='hiddenRow bg-success'>
+        <tr id='pt43.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4645,7 +4237,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.22' class='hiddenRow bg-success'>
+        <tr id='pt43.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4654,7 +4246,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.23' class='hiddenRow bg-success'>
+        <tr id='pt43.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4663,7 +4255,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.24' class='hiddenRow bg-success'>
+        <tr id='pt43.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4672,7 +4264,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.25' class='hiddenRow bg-success'>
+        <tr id='pt43.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4681,7 +4273,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.26' class='hiddenRow bg-success'>
+        <tr id='pt43.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4690,7 +4282,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.27' class='hiddenRow bg-success'>
+        <tr id='pt43.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4699,7 +4291,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.28' class='hiddenRow bg-success'>
+        <tr id='pt43.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4708,7 +4300,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.29' class='hiddenRow bg-success'>
+        <tr id='pt43.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4717,7 +4309,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.30' class='hiddenRow bg-success'>
+        <tr id='pt43.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4726,7 +4318,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.31' class='hiddenRow bg-success'>
+        <tr id='pt43.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4735,7 +4327,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.32' class='hiddenRow bg-success'>
+        <tr id='pt43.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4744,7 +4336,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.33' class='hiddenRow bg-success'>
+        <tr id='pt43.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4753,7 +4345,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.34' class='hiddenRow bg-success'>
+        <tr id='pt43.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4771,13 +4363,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 16)">Detail</a>
+            <a onclick="showClassDetail('c44', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4786,7 +4378,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4795,7 +4387,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4804,7 +4396,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4813,7 +4405,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4822,7 +4414,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4831,7 +4423,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4840,7 +4432,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4849,7 +4441,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4858,7 +4450,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4867,7 +4459,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4876,7 +4468,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4885,7 +4477,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4894,7 +4486,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4903,7 +4495,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4912,7 +4504,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4923,11 +4515,11 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>384</td>
-        <td>352</td>
-        <td>11</td>
-        <td>15</td>
-        <td>6</td>
+        <td>382</td>
+        <td>368</td>
+        <td>0</td>
+        <td>7</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -5309,7 +4901,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(352, 11, 15, 6);
+    drawCircle(368, 0, 7, 7);
     showCase(5);
 </script>
 

From 3fc326fa48191d080e03878de9b00bd8a53e5a70 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:45:16 +0100
Subject: [PATCH 057/220] Update French translation

---
 cps/translations/fr/LC_MESSAGES/messages.po | 42 ++++++++++-----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 75e834a0..e3d6bdaf 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -83,7 +83,7 @@ msgstr "Configuration de l’interface utilisateur"
 #: cps/admin.py:277 cps/templates/admin.html:50
 #, fuzzy
 msgid "Edit Users"
-msgstr "Utilisateur admin"
+msgstr "Éditer les utilisateurs"
 
 #: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
 #: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
@@ -214,7 +214,7 @@ msgstr "Voulez-vous vraiment arrêter Calibre-Web ?"
 
 #: cps/admin.py:594
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "Êtes-vous certain de vouloir supprimer la base de données de synchronisation de Calibre-Web pour forcer une synchronisation complète avec votre liseuse Kobo ?"
 
 #: cps/admin.py:743
 msgid "Tag not found"
@@ -238,7 +238,7 @@ msgstr "Autoriser"
 
 #: cps/admin.py:913
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} entrées de synchronisation supprimées"
 
 #: cps/admin.py:1036
 msgid "client_secrets.json Is Not Configured For Web Application"
@@ -472,7 +472,7 @@ msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répert
 
 #: cps/admin.py:1741
 msgid "Files could not be replaced during update"
-msgstr ""
+msgstr "Les fichiers n’ont pas pu être remplacés pendant la mise à jour"
 
 #: cps/admin.py:1765
 #, fuzzy
@@ -523,7 +523,7 @@ msgstr "Le livre a été supprimé avec succès"
 
 #: cps/editbooks.py:361
 msgid "You are missing permissions to delete books"
-msgstr ""
+msgstr "Vous n’avez par les permissions pour supprimer les livres"
 
 #: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
 #: cps/web.py:1744 cps/web.py:1811
@@ -756,7 +756,7 @@ msgstr "Seuls les fichiers jpg/jpeg/png/webp/bmp sont supportés comme fichier d
 
 #: cps/helper.py:648
 msgid "Invalid cover file content"
-msgstr ""
+msgstr "Contenu du fichier de couverture invalide"
 
 #: cps/helper.py:652
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -1045,7 +1045,7 @@ msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
 
 #: cps/shelf.py:126
 msgid "You are not allowed to add a book to the shelf"
-msgstr ""
+msgstr "Vous n’êtes pas autorisé à ajouter un livre à l’étagère"
 
 #: cps/shelf.py:144
 #, python-format
@@ -1069,7 +1069,7 @@ msgstr "Le livre a été supprimé de l'étagère %(sname)s"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à supprimer un livre de cette étagère"
 
 #: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
@@ -1086,7 +1086,7 @@ msgstr "Modifier une étagère"
 
 #: cps/shelf.py:249
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr ""
+msgstr "Désolé, vous n’êtes pas autorisé à créer une étagère publique"
 
 #: cps/shelf.py:266
 #, python-format
@@ -1524,7 +1524,7 @@ msgstr "Nom de l'en-tête du Reverse Proxy"
 #: cps/templates/admin.html:157
 #, fuzzy
 msgid "Edit Calibre Database Configuration"
-msgstr "Éditer la configuration principale"
+msgstr "Éditer la configuration de la base de données Calibre"
 
 #: cps/templates/admin.html:158
 msgid "Edit Basic Configuration"
@@ -1532,7 +1532,7 @@ msgstr "Éditer la configuration principale"
 
 #: cps/templates/admin.html:159
 msgid "Edit UI Configuration"
-msgstr "Configuration de l’interface utilisateur"
+msgstr "Éditer la configuration de l’interface utilisateur"
 
 #: cps/templates/admin.html:164
 msgid "Administration"
@@ -1906,7 +1906,7 @@ msgstr "Saisir le nom du domaine"
 
 #: cps/templates/book_table.html:73
 msgid "Comments"
-msgstr ""
+msgstr "Commentaires"
 
 #: cps/templates/book_table.html:77 cps/templates/book_table.html:79
 #: cps/templates/book_table.html:81 cps/templates/book_table.html:83
@@ -1991,7 +1991,7 @@ msgstr "Nightly"
 
 #: cps/templates/config_edit.html:50
 msgid "Trusted Hosts (Comma Separated)"
-msgstr ""
+msgstr "Hôtes de confiance (séparés par des virgules)"
 
 #: cps/templates/config_edit.html:61
 msgid "Logfile Configuration"
@@ -2015,7 +2015,7 @@ msgstr "Configuration des options"
 
 #: cps/templates/config_edit.html:104
 msgid "Convert non-English characters in title and author while saving to disk"
-msgstr ""
+msgstr "Convertir les caractères non-anglais des titre et auteur lors de l’enregistrement sur le disque"
 
 #: cps/templates/config_edit.html:108
 msgid "Enable Uploads"
@@ -2023,7 +2023,7 @@ msgstr "Autoriser le téléversement de fichier"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr ""
+msgstr "(Svp, vérifiez que les utilisateurs ont aussi les droits de téléchargement vers le serveur)
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"
@@ -2184,7 +2184,7 @@ msgstr "Champ des membres de groupe LDAP"
 
 #: cps/templates/config_edit.html:278
 msgid "LDAP Member User Filter Detection"
-msgstr ""
+msgstr "Filtre de détection des utilisateurs membres LDAP"
 
 #: cps/templates/config_edit.html:280
 msgid "Autodetect"
@@ -2347,7 +2347,7 @@ msgstr "Écouter dans le navigateur"
 #: cps/templates/detail.html:124
 #, fuzzy, python-format
 msgid "Book %(index)s of %(range)s"
-msgstr ""
+msgstr "Livre %(index)s sur %(range)s"
 
 #: cps/templates/detail.html:173
 msgid "Published"
@@ -2488,11 +2488,11 @@ msgstr "Déconnecter l’utilisateur"
 
 #: cps/templates/index.html:69
 msgid "Sort ascending according to download count"
-msgstr ""
+msgstr "Trier de manière ascendante selon le nombre de téléchargements"
 
 #: cps/templates/index.html:70
 msgid "Sort descending according to download count"
-msgstr ""
+msgstr "Trier de manière descendante selon le nombre de téléchargements"
 
 #: cps/templates/index.html:76 cps/templates/search.html:33
 #: cps/templates/shelf.html:23
@@ -3111,7 +3111,7 @@ msgstr "Créer/visualiser"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "Forcer une synchronisation complète Kobo"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
@@ -3136,7 +3136,7 @@ msgstr "Sélectionner..."
 #: cps/templates/user_table.html:131
 #, fuzzy
 msgid "Edit User"
-msgstr "Utilisateur admin"
+msgstr "Éditer l’utilisateur"
 
 #: cps/templates/user_table.html:134
 #, fuzzy

From 58cb54c76f5f38d5f152516b866e94a93d34b4f9 Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 13 Jan 2022 22:47:47 +0100
Subject: [PATCH 058/220] small typo

---
 cps/translations/fr/LC_MESSAGES/messages.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index e3d6bdaf..b9141fc8 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -2023,7 +2023,7 @@ msgstr "Autoriser le téléversement de fichier"
 
 #: cps/templates/config_edit.html:108
 msgid "(Please ensure users having also upload rights)"
-msgstr "(Svp, vérifiez que les utilisateurs ont aussi les droits de téléchargement vers le serveur)
+msgstr "(Svp, vérifiez que les utilisateurs ont aussi les droits de téléchargement vers le serveur)"
 
 #: cps/templates/config_edit.html:112
 msgid "Allowed Upload Fileformats"

From f6f20ebc7718156bbef59b68c7442e7992afb979 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 15 Jan 2022 09:18:51 +0100
Subject: [PATCH 059/220] Update teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 1132 ++++++++++-------------
 1 file changed, 479 insertions(+), 653 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index f1ddb0e5..94bab0c2 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-09 18:09:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-13 19:08:39</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>2022-01-10 10:00:36</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-13 23:00:09</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>15h 11 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 10 min</p>
         </div>
       </div>
       </div>
@@ -561,11 +561,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">6</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -593,11 +593,33 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id="ft7.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</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_ft7.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 332, in test_convert_only
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -714,12 +736,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">16</td>
-        <td class="text-center">9</td>
+        <td class="text-center">14</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">5</td>
         <td class="text-center">2</td>
         <td class="text-center">
             <a onclick="showClassDetail('c10', 16)">Detail</a>
@@ -791,164 +813,38 @@
     
     
     
-        <tr id="et10.8" class="none bg-info">
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 685, in test_title_sort
-    self.fill_view_config({&#39;config_title_regex&#39;: &#39;^(Beta)\s+&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 409, in fill_view_config
-    ele.clear()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 95, in clear
-    self._execute(Command.CLEAR_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_title_regex&#34; class=&#34;form-control&#34; name=&#34;config_title_regex&#34; type=&#34;text&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.9" class="none bg-info">
+        <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 526, in test_upload_edit_role
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.10" class="none bg-info">
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 55, in test_upload_metadata_cbr
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.11" class="none bg-info">
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 92, in test_upload_metadata_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 355, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 326, in _fill_basic_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;config_uploading&#34; name=&#34;config_uploading&#34; type=&#34;checkbox&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -979,45 +875,11 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id="et10.13" class="none bg-info">
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 256, in test_writeonly_path
-    self.fill_view_config({&#39;config_read_column&#39;: &#34;Custom Bool 1 Ä&#34;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 414, in fill_view_config
-    select.select_by_visible_text(process_selects[key])
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 120, in select_by_visible_text
-    self._setSelected(opt)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/select.py&#34;, line 212, in _setSelected
-    option.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;option&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1050,60 +912,6 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c11', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et11.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 41, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 445, in stop_calibre_web
-    element.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;shutdown&#34; class=&#34;btn btn-default&#34; type=&#34;button&#34;&gt; could not be scrolled into view</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
     <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">35</td>
@@ -1112,13 +920,13 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 35)">Detail</a>
+            <a onclick="showClassDetail('c11', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1127,7 +935,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1136,7 +944,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1145,7 +953,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1154,7 +962,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1163,7 +971,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1172,7 +980,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1181,7 +989,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1190,7 +998,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1199,7 +1007,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1208,7 +1016,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1217,7 +1025,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1226,7 +1034,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1235,7 +1043,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1244,7 +1052,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1253,7 +1061,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1262,7 +1070,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1271,7 +1079,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1280,7 +1088,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.19' class='hiddenRow bg-success'>
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1289,19 +1097,19 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id="st12.20" class="none bg-warning">
+        <tr id="st11.20" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st11.20" 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_st12.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1315,7 +1123,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.21' class='hiddenRow bg-success'>
+        <tr id='pt11.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1324,7 +1132,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.22' class='hiddenRow bg-success'>
+        <tr id='pt11.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1333,7 +1141,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.23' class='hiddenRow bg-success'>
+        <tr id='pt11.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1342,7 +1150,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.24' class='hiddenRow bg-success'>
+        <tr id='pt11.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1351,7 +1159,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.25' class='hiddenRow bg-success'>
+        <tr id='pt11.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1360,7 +1168,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.26' class='hiddenRow bg-success'>
+        <tr id='pt11.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1369,7 +1177,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.27' class='hiddenRow bg-success'>
+        <tr id='pt11.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1378,7 +1186,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.28' class='hiddenRow bg-success'>
+        <tr id='pt11.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1387,7 +1195,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.29' class='hiddenRow bg-success'>
+        <tr id='pt11.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1396,7 +1204,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.30' class='hiddenRow bg-success'>
+        <tr id='pt11.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1405,7 +1213,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.31' class='hiddenRow bg-success'>
+        <tr id='pt11.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1414,7 +1222,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.32' class='hiddenRow bg-success'>
+        <tr id='pt11.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1423,7 +1231,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.33' class='hiddenRow bg-success'>
+        <tr id='pt11.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1432,7 +1240,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.34' class='hiddenRow bg-success'>
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1441,7 +1249,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt12.35' class='hiddenRow bg-success'>
+        <tr id='pt11.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1451,21 +1259,21 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 18)">Detail</a>
+            <a onclick="showClassDetail('c12', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1474,7 +1282,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1483,7 +1291,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1492,7 +1300,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1501,7 +1309,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1510,7 +1318,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1519,7 +1327,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1528,7 +1336,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1537,7 +1345,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1546,7 +1354,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1555,7 +1363,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1564,7 +1372,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1573,7 +1381,7 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1582,38 +1390,16 @@ selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt
     
     
     
-        <tr id="et13.14" class="none bg-info">
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et13.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 270, in test_bookslist_edit_seriesindex
-    bl = self.get_books_list(-1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1826, in get_books_list
-    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1622,7 +1408,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1631,7 +1417,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1640,7 +1426,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1650,45 +1436,65 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c13', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et13.1" class="none bg-info">
+            <td>
+                <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 133, in test_load_metadata
+    results[1][&#39;cover_element&#39;].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">20</td>
+        <td class="text-center">19</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 1)">Detail</a>
+            <a onclick="showClassDetail('c14', 20)">Detail</a>
         </td>
     </tr>
 
     
     
         <tr id='pt14.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</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('c15', 20)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1697,7 +1503,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1706,7 +1512,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1715,7 +1521,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1724,7 +1530,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1733,7 +1539,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1742,7 +1548,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1751,7 +1557,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1760,7 +1566,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1769,7 +1575,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1778,7 +1584,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1787,7 +1593,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1796,7 +1602,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1805,7 +1611,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1814,7 +1620,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1823,16 +1629,36 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id="et14.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</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_et14.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
+    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1841,7 +1667,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1850,7 +1676,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.19' class='hiddenRow bg-success'>
+        <tr id='pt14.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1859,7 +1685,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt15.20' class='hiddenRow bg-success'>
+        <tr id='pt14.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1877,13 +1703,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -1901,13 +1727,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 3)">Detail</a>
+            <a onclick="showClassDetail('c16', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1916,7 +1742,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1925,7 +1751,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1943,13 +1769,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 7)">Detail</a>
+            <a onclick="showClassDetail('c17', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1958,7 +1784,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1967,7 +1793,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1976,7 +1802,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1985,7 +1811,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1994,7 +1820,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2003,7 +1829,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2021,13 +1847,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2045,13 +1871,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2069,13 +1895,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2093,13 +1919,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2117,13 +1943,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2132,7 +1958,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2141,7 +1967,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2159,13 +1985,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 11)">Detail</a>
+            <a onclick="showClassDetail('c23', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2174,7 +2000,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2183,7 +2009,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2192,7 +2018,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2201,7 +2027,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2210,7 +2036,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2219,7 +2045,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2228,7 +2054,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt23.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2237,7 +2063,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.9' class='hiddenRow bg-success'>
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2246,7 +2072,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id='pt23.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2255,7 +2081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id='pt23.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2273,13 +2099,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 5)">Detail</a>
+            <a onclick="showClassDetail('c24', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2288,7 +2114,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2297,7 +2123,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2306,7 +2132,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2315,7 +2141,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2333,13 +2159,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 13)">Detail</a>
+            <a onclick="showClassDetail('c25', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2348,19 +2174,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st26.2" class="none bg-warning">
+        <tr id="st25.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st25.2" 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_st26.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st25.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2374,7 +2200,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2383,7 +2209,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2392,7 +2218,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2401,7 +2227,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2410,7 +2236,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2419,7 +2245,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2428,7 +2254,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2437,7 +2263,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2446,7 +2272,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2455,7 +2281,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.12' class='hiddenRow bg-success'>
+        <tr id='pt25.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2464,7 +2290,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt26.13' class='hiddenRow bg-success'>
+        <tr id='pt25.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2482,13 +2308,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 8)">Detail</a>
+            <a onclick="showClassDetail('c26', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2497,7 +2323,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2506,7 +2332,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2515,7 +2341,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2524,7 +2350,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2533,7 +2359,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2542,7 +2368,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2551,7 +2377,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2569,13 +2395,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 9)">Detail</a>
+            <a onclick="showClassDetail('c27', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2584,7 +2410,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2593,7 +2419,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2602,7 +2428,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2611,19 +2437,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st28.5" class="none bg-warning">
+        <tr id="st27.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st28.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st27.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_st28.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st27.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2637,7 +2463,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2646,7 +2472,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2655,7 +2481,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2664,7 +2490,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2682,13 +2508,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 15)">Detail</a>
+            <a onclick="showClassDetail('c28', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2697,7 +2523,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2706,7 +2532,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2715,7 +2541,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2724,7 +2550,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2733,7 +2559,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2742,7 +2568,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2751,7 +2577,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2760,7 +2586,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2769,7 +2595,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2778,7 +2604,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2787,7 +2613,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2796,7 +2622,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2805,7 +2631,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt28.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2814,7 +2640,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt28.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2832,13 +2658,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c29', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2847,7 +2673,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2865,13 +2691,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2880,7 +2706,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2898,13 +2724,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 23)">Detail</a>
+            <a onclick="showClassDetail('c31', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2913,7 +2739,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2922,7 +2748,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2931,7 +2757,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2940,7 +2766,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2949,7 +2775,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2958,7 +2784,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2967,7 +2793,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2976,7 +2802,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2985,7 +2811,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2994,7 +2820,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3003,7 +2829,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3012,7 +2838,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3021,7 +2847,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3030,7 +2856,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3039,7 +2865,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.16' class='hiddenRow bg-success'>
+        <tr id='pt31.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3048,7 +2874,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.17' class='hiddenRow bg-success'>
+        <tr id='pt31.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3057,7 +2883,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.18' class='hiddenRow bg-success'>
+        <tr id='pt31.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3066,7 +2892,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.19' class='hiddenRow bg-success'>
+        <tr id='pt31.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3075,7 +2901,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.20' class='hiddenRow bg-success'>
+        <tr id='pt31.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3084,7 +2910,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.21' class='hiddenRow bg-success'>
+        <tr id='pt31.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3093,7 +2919,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.22' class='hiddenRow bg-success'>
+        <tr id='pt31.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3102,7 +2928,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt32.23' class='hiddenRow bg-success'>
+        <tr id='pt31.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3120,13 +2946,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 1)">Detail</a>
+            <a onclick="showClassDetail('c32', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3144,13 +2970,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 5)">Detail</a>
+            <a onclick="showClassDetail('c33', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3159,7 +2985,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3168,7 +2994,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3177,7 +3003,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3186,7 +3012,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3204,13 +3030,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 8)">Detail</a>
+            <a onclick="showClassDetail('c34', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3219,7 +3045,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3228,7 +3054,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3237,7 +3063,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3246,7 +3072,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3255,7 +3081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3264,7 +3090,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3273,7 +3099,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt35.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3291,13 +3117,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3306,7 +3132,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3315,7 +3141,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3333,13 +3159,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 14)">Detail</a>
+            <a onclick="showClassDetail('c36', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3348,7 +3174,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3357,7 +3183,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3366,7 +3192,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3375,7 +3201,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3384,7 +3210,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3393,7 +3219,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3402,7 +3228,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3411,7 +3237,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3420,7 +3246,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.10' class='hiddenRow bg-success'>
+        <tr id='pt36.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3429,7 +3255,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.11' class='hiddenRow bg-success'>
+        <tr id='pt36.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3438,19 +3264,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st37.12" class="none bg-warning">
+        <tr id="st36.12" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.12')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st37.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.12" 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_st37.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.12').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3464,7 +3290,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.13' class='hiddenRow bg-success'>
+        <tr id='pt36.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3473,7 +3299,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt37.14' class='hiddenRow bg-success'>
+        <tr id='pt36.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3491,13 +3317,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 9)">Detail</a>
+            <a onclick="showClassDetail('c37', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3506,7 +3332,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3515,7 +3341,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3524,7 +3350,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3533,7 +3359,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3542,7 +3368,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3551,19 +3377,19 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="st38.7" class="none bg-warning">
+        <tr id="st37.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st38.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.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_st38.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3577,7 +3403,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3586,7 +3412,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3604,13 +3430,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 2)">Detail</a>
+            <a onclick="showClassDetail('c38', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3619,7 +3445,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3637,13 +3463,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 18)">Detail</a>
+            <a onclick="showClassDetail('c39', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3652,7 +3478,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3661,7 +3487,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3670,7 +3496,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3679,7 +3505,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3688,7 +3514,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3697,7 +3523,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3706,7 +3532,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3715,7 +3541,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3724,7 +3550,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt39.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3733,7 +3559,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt39.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3742,7 +3568,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt39.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3751,7 +3577,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt39.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3760,7 +3586,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt39.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3769,7 +3595,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt39.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3778,7 +3604,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt39.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3787,7 +3613,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt39.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3796,7 +3622,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt39.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3814,13 +3640,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 1)">Detail</a>
+            <a onclick="showClassDetail('c40', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3838,13 +3664,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 21)">Detail</a>
+            <a onclick="showClassDetail('c41', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3853,7 +3679,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3862,7 +3688,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3871,7 +3697,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3880,7 +3706,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3889,7 +3715,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3898,7 +3724,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3907,7 +3733,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3916,7 +3742,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3925,7 +3751,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3934,7 +3760,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3943,7 +3769,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3952,7 +3778,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3961,7 +3787,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3970,7 +3796,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3979,7 +3805,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3988,7 +3814,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3997,7 +3823,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4006,7 +3832,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.19' class='hiddenRow bg-success'>
+        <tr id='pt41.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4015,7 +3841,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.20' class='hiddenRow bg-success'>
+        <tr id='pt41.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4024,7 +3850,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt42.21' class='hiddenRow bg-success'>
+        <tr id='pt41.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4042,13 +3868,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 34)">Detail</a>
+            <a onclick="showClassDetail('c42', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4057,7 +3883,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4066,7 +3892,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4075,7 +3901,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4084,7 +3910,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4093,7 +3919,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4102,7 +3928,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4111,7 +3937,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4120,7 +3946,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4129,7 +3955,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4138,7 +3964,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4147,7 +3973,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4156,7 +3982,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4165,7 +3991,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4174,7 +4000,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4183,7 +4009,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4192,7 +4018,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4201,7 +4027,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4210,7 +4036,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4219,7 +4045,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4228,7 +4054,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4237,7 +4063,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.22' class='hiddenRow bg-success'>
+        <tr id='pt42.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4246,7 +4072,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.23' class='hiddenRow bg-success'>
+        <tr id='pt42.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4255,7 +4081,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.24' class='hiddenRow bg-success'>
+        <tr id='pt42.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4264,7 +4090,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.25' class='hiddenRow bg-success'>
+        <tr id='pt42.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4273,7 +4099,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.26' class='hiddenRow bg-success'>
+        <tr id='pt42.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4282,7 +4108,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.27' class='hiddenRow bg-success'>
+        <tr id='pt42.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4291,7 +4117,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.28' class='hiddenRow bg-success'>
+        <tr id='pt42.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4300,7 +4126,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.29' class='hiddenRow bg-success'>
+        <tr id='pt42.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4309,7 +4135,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.30' class='hiddenRow bg-success'>
+        <tr id='pt42.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4318,7 +4144,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.31' class='hiddenRow bg-success'>
+        <tr id='pt42.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4327,7 +4153,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.32' class='hiddenRow bg-success'>
+        <tr id='pt42.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4336,7 +4162,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.33' class='hiddenRow bg-success'>
+        <tr id='pt42.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4345,7 +4171,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt43.34' class='hiddenRow bg-success'>
+        <tr id='pt42.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4363,13 +4189,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 16)">Detail</a>
+            <a onclick="showClassDetail('c43', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4378,7 +4204,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4387,7 +4213,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4396,7 +4222,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4405,7 +4231,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4414,7 +4240,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4423,7 +4249,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4432,7 +4258,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4441,7 +4267,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4450,7 +4276,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4459,7 +4285,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4468,7 +4294,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4477,7 +4303,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4486,7 +4312,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4495,7 +4321,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4504,7 +4330,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4515,10 +4341,10 @@ IndexError: list index out of range</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>382</td>
-        <td>368</td>
-        <td>0</td>
-        <td>7</td>
+        <td>381</td>
+        <td>371</td>
+        <td>1</td>
+        <td>2</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4547,7 +4373,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-23-generic #23~20.04.2-Ubuntu SMP Fri Dec 10 12:06:47 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-25-generic #26~20.04.1-Ubuntu SMP Fri Jan 7 16:27:40 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4853,13 +4679,13 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.3</td>
+              <td>4.4.0</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.3</td>
+              <td>4.4.0</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -4871,7 +4697,7 @@ IndexError: list index out of range</pre>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.3.3</td>
+              <td>4.4.0</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -4901,7 +4727,7 @@ IndexError: list index out of range</pre>
 </div>
 
 <script>
-    drawCircle(368, 0, 7, 7);
+    drawCircle(371, 1, 2, 7);
     showCase(5);
 </script>
 

From 5b59aab81ae413456afa9b688f9aaa7e77e94012 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 15 Jan 2022 18:01:47 +0100
Subject: [PATCH 060/220] Udpate requirements and config.cfg

---
 optional-requirements.txt |  21 +++---
 requirements.txt          |   6 +-
 setup.cfg                 | 150 +++++++++++++++++++-------------------
 3 files changed, 88 insertions(+), 89 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2368be10..92a01488 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,4 +1,5 @@
 # GDrive Integration
+google-api-python-client>=1.7.11,<2.36.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -8,14 +9,12 @@ pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
-rsa>=3.4.2,<4.8.0
+rsa>=3.4.2,<4.9.0
 six>=1.10.0,<1.17.0
 
-# Gdrive and Gmail integration
-google-api-python-client>=1.7.11,<2.34.0
-
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
+google-api-python-client>=1.7.11,<2.36.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
@@ -25,17 +24,17 @@ python-Levenshtein>=0.12.0,<0.13.0
 python-ldap>=3.0.0,<3.5.0
 Flask-SimpleLDAP>=1.4.0,<1.5.0
 
-#oauth
+# oauth
 Flask-Dance>=2.0.0,<5.2.0
-SQLAlchemy-Utils>=0.33.5,<0.38.0
+SQLAlchemy-Utils>=0.33.5,<0.39.0
 
-# extracting metadata
+# metadata extraction
 rarfile>=2.7
-scholarly>=1.2.0, <1.6
+scholarly>=1.2.0,<1.6
 
-# other
+# Comics
 natsort>=2.2.0,<8.1.0
 comicapi>=2.2.0,<2.3.0
 
-#Kobo integration
-jsonschema>=3.2.0,<4.4.0
+# Kobo integration
+jsonschema>=3.2.0,<4.5.0
diff --git a/requirements.txt b/requirements.txt
index 1db961fe..b8c5744e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,10 +7,10 @@ Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
 PyPDF3>=1.0.0,<1.0.6
 pytz>=2016.10
-requests>=2.11.1,<2.25.0
+requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
 tornado>=4.1,<6.2
 Wand>=0.4.4,<0.7.0
-unidecode>=0.04.19,<1.3.0
-lxml>=3.8.0,<4.7.0
+unidecode>=0.04.19,<1.4.0
+lxml>=3.8.0,<4.8.0
 flask-wtf>=0.14.2,<1.1.0
diff --git a/setup.cfg b/setup.cfg
index 52f1d813..3a81dc2b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,93 +1,93 @@
 [metadata]
 name = calibreweb
 url = https://github.com/janeczku/calibre-web
-project_urls =
-  Bug Tracker = https://github.com/janeczku/calibre-web/issues
-  Release Management = https://github.com/janeczku/calibre-web/releases
-  Documentation = https://github.com/janeczku/calibre-web/wiki
-  Source Code = https://github.com/janeczku/calibre-web
+project_urls = 
+	Bug Tracker = https://github.com/janeczku/calibre-web/issues
+	Release Management = https://github.com/janeczku/calibre-web/releases
+	Documentation = https://github.com/janeczku/calibre-web/wiki
+	Source Code = https://github.com/janeczku/calibre-web
 description = Web app for browsing, reading and downloading eBooks stored in a Calibre database.
 long_description = file: README.md
-long_description_content_type= text/markdown
+long_description_content_type = text/markdown
 author = @OzzieIsaacs
 author_email = Ozzie.Fernandez.Isaacs@googlemail.com
 maintainer = @OzzieIsaacs
 license = GPLv3+
 license_file = LICENSE
-classifiers =
-    Development Status :: 5 - Production/Stable
-    License :: OSI Approved :: GNU Affero General Public License v3
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    Programming Language :: Python :: 3.10
-    Operating System :: OS Independent
-keywords =
-  calibre
-  calibre-web
-  library
+classifiers = 
+	Development Status :: 5 - Production/Stable
+	License :: OSI Approved :: GNU Affero General Public License v3
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.5
+	Programming Language :: Python :: 3.6
+	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Operating System :: OS Independent
+keywords = 
+	calibre
+	calibre-web
+	library
 python_requires = >=3.5
 
 [options.entry_points]
-console_scripts =
-  cps = calibreweb:main
+console_scripts = 
+	cps = calibreweb:main
+
 [options]
 include_package_data = True
-install_requires =
-    Babel>=1.3,<3.0
-    Flask-Babel>=0.11.1,<2.1.0
-    Flask-Login>=0.3.2,<0.5.1
-    Flask-Principal>=0.3.2,<0.5.1
-    backports_abc>=0.4
-    Flask>=1.0.2,<2.1.0
-    iso-639>=0.4.5,<0.5.0
-    PyPDF3>=1.0.0,<1.0.6
-    pytz>=2016.10
-    requests>=2.11.1,<2.25.0
-    SQLAlchemy>=1.3.0,<1.5.0
-    tornado>=4.1,<6.2
-    Wand>=0.4.4,<0.7.0
-    unidecode>=0.04.19,<1.3.0
-    lxml>=3.8.0,<4.7.0
-    flask-wtf>=0.14.2,<1.1.0
+install_requires = 
+	Babel>=1.3,<3.0
+	Flask-Babel>=0.11.1,<2.1.0
+	Flask-Login>=0.3.2,<0.5.1
+	Flask-Principal>=0.3.2,<0.5.1
+	backports_abc>=0.4
+	Flask>=1.0.2,<2.1.0
+	iso-639>=0.4.5,<0.5.0
+	PyPDF3>=1.0.0,<1.0.6
+	pytz>=2016.10
+	requests>=2.11.1,<2.28.0
+	SQLAlchemy>=1.3.0,<1.5.0
+	tornado>=4.1,<6.2
+	Wand>=0.4.4,<0.7.0
+	unidecode>=0.04.19,<1.4.0
+	lxml>=3.8.0,<4.8.0
+	flask-wtf>=0.14.2,<1.1.0
+	
 
 [options.extras_require]
-gdrive =
-    google-api-python-client>=1.7.11,<2.34.0
-    gevent>20.6.0,<22.0.0
-    greenlet>=0.4.17,<1.2.0
-    httplib2>=0.9.2,<0.21.0
-    oauth2client>=4.0.0,<4.1.4
-    uritemplate>=3.0.0,<4.2.0
-    pyasn1-modules>=0.0.8,<0.3.0
-    pyasn1>=0.1.9,<0.5.0
-    PyDrive2>=1.3.1,<1.11.0
-    PyYAML>=3.12
-    rsa>=3.4.2,<4.8.0
-    six>=1.10.0,<1.17.0
-gmail =
-    google-auth-oauthlib>=0.4.3,<0.5.0
-    google-api-python-client>=1.7.11,<2.34.0
-goodreads =
-    goodreads>=0.3.2,<0.4.0
-    python-Levenshtein>=0.12.0,<0.13.0
-ldap =
-    python-ldap>=3.0.0,<3.5.0
-    Flask-SimpleLDAP>=1.4.0,<1.5.0
-oauth =
-    Flask-Dance>=2.0.0,<5.2.0
-    SQLAlchemy-Utils>=0.33.5,<0.38.0
-metadata =
-    rarfile>=2.7
-    scholarly>=1.2.0,<1.6
-comics =
-    natsort>=2.2.0,<8.1.0
-    comicapi>= 2.2.0,<2.3.0
-kobo =
-    jsonschema>=3.2.0,<4.4.0
-
-
+gdrive = 
+	google-api-python-client>=1.7.11,<2.36.0
+	gevent>20.6.0,<22.0.0
+	greenlet>=0.4.17,<1.2.0
+	httplib2>=0.9.2,<0.21.0
+	oauth2client>=4.0.0,<4.1.4
+	uritemplate>=3.0.0,<4.2.0
+	pyasn1-modules>=0.0.8,<0.3.0
+	pyasn1>=0.1.9,<0.5.0
+	PyDrive2>=1.3.1,<1.11.0
+	PyYAML>=3.12
+	rsa>=3.4.2,<4.9.0
+	six>=1.10.0,<1.17.0
+gmail = 
+	google-auth-oauthlib>=0.4.3,<0.5.0
+	google-api-python-client>=1.7.11,<2.36.0
+goodreads = 
+	goodreads>=0.3.2,<0.4.0
+	python-Levenshtein>=0.12.0,<0.13.0
+ldap = 
+	python-ldap>=3.0.0,<3.5.0
+	Flask-SimpleLDAP>=1.4.0,<1.5.0
+oauth = 
+	Flask-Dance>=2.0.0,<5.2.0
+	SQLAlchemy-Utils>=0.33.5,<0.39.0
+metadata = 
+	rarfile>=2.7
+	scholarly>=1.2.0,<1.6
+comics = 
+	natsort>=2.2.0,<8.1.0
+	comicapi>=2.2.0,<2.3.0
+kobo = 
+	jsonschema>=3.2.0,<4.5.0
 

From a118fffc993cb23dd37f911fc88fb5ac37937ae4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 15 Jan 2022 19:58:13 +0100
Subject: [PATCH 061/220] Added missing chardet (used by requests in older
 versions)

---
 requirements.txt                  |    1 +
 test/Calibre-Web TestSummary.html | 2947 -----------------------------
 2 files changed, 1 insertion(+), 2947 deletions(-)
 delete mode 100755 test/Calibre-Web TestSummary.html

diff --git a/requirements.txt b/requirements.txt
index b8c5744e..0b95dfa3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,3 +14,4 @@ Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.4.0
 lxml>=3.8.0,<4.8.0
 flask-wtf>=0.14.2,<1.1.0
+chardet>=3.0.0,<4.1.0
diff --git a/test/Calibre-Web TestSummary.html b/test/Calibre-Web TestSummary.html
deleted file mode 100755
index 10e2e0ee..00000000
--- a/test/Calibre-Web TestSummary.html	
+++ /dev/null
@@ -1,2947 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Calibre-Web Tests</title>
-    <meta name="generator" content=""/>
-    <meta name="version" content=""/>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- Bootstrap -->
-    <link href="./../cps/static/css/libs/bootstrap.min.css" rel="stylesheet">
-    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="./../cps/static/js/libs/jquery.min.js"></script>
-    <!-- Include all compiled plugins (below), or include individual files as needed -->
-    <script src="./../cps/static/js/libs/bootstrap.min.js"></script>
-    <!-- Project CSS -->
-    <link href="css/runner.css" rel="stylesheet">
-    <!-- Project JS -->
-    <script src="js/runner.js"></script>
-</head>
-
-<body>
-
-
-    <div class="row report-title">
-        <h1 id='report_title' class="text-center">Calibre-Web Tests</h1>
-    </div>
-  <div class="row">
-    <div class="col">
-      <div class="col-xs-12 col-sm-6">
-        <div class="piechart">
-          <div>
-              <canvas id="circle" width="350" height="168" ></canvas>
-          </div>
-        </div>
-      </div>
-      <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-08-30 15:47:09</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-08-30 17:06:27</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>1h 7 min</p>
-        </div>
-      </div>
-      </div>
-    </div>
-  </div>
-
-    <div class='report-description'>
-        <div id='report_description' class='row text-center'></div>
-    </div>
-<div class='text-center buttons'>
-<div id='show_detail_line' class="btn-group pagination-centered" role="group" aria-label="TESTE">
-    <button type="button" class="btn btn-success" data-toggle="button" aria-pressed="false" data-placement="top"
-            title="Show only the execution summary" onclick="showCase(0)">Summary
-    </button>
-    <button type="button" class="btn btn-info" data-toggle="button" aria-pressed="false" data-placement="top"
-            title="Show only the execution summary" onclick="showCase(5)">Summary Problems
-    </button>
-    <button type="button" class="btn btn-warning" data-toggle="button" aria-pressed="false" data-placement="top"
-            title="Show skipped test cases" onclick="showCase(3)">Skipped
-    </button>
-    <button type="button" class="btn btn-danger" data-toggle="button" aria-pressed="false" data-placement="top"
-            title="Show the filed test cases" onclick="showCase(1)">Failed
-    </button>
-        <button type="button" class="btn btn-info" data-toggle="button" aria-pressed="false" data-placement="top"
-            title="Show the filed test cases" onclick="showCase(4)">Error
-    </button>
-    <button type="button" class="btn btn-primary" data-toggle="tooltip" aria-pressed="false" data-placement="top"
-            title="Show all test cases" onclick="showCase(2)">All
-    </button>
-</div>
-</div>
-<table id='result_table' class='table table-bordered table-responsive table-curved'>
-    <colgroup>
-        <col/>
-        <col/>
-        <col/>
-        <col/>
-        <col/>
-        <col/>
-    </colgroup>
-    <tr id='header_row' class="text-center bg-grey">
-        <td>Test Group/Test case</td>
-        <td>Count</td>
-        <td>Pass</td>
-        <td>Fail</td>
-        <td>Error</td>
-        <td>Skip</td>
-        <td>View</td>
-    </tr>
-
-
-    <tr id="su" class="passClass">
-        <td>TestAnonymous</td>
-        <td class="text-center">13</td>
-        <td class="text-center">13</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', 13)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt1.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_check_locale_guest</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_format</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_hot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rated</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt1.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="skipClass">
-        <td>TestCli</td>
-        <td class="text-center">7</td>
-        <td class="text-center">6</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('c2', 7)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt2.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCli - test_already_started</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt2.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCli - test_bind_to_single_interface</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt2.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCli - test_cli_SSL_files</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt2.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCli - test_cli_different_folder</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt2.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCli - test_cli_different_settings_database</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st2.6' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestCli - test_cli_gdrive_location</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st2.6')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st2.6' 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_st2.6').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>
-        </tr>
-    
-    
-    
-        <tr id='pt2.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCli - test_environ_port_setting</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
-        <td>TestCoverEditBooks</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c3', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='ft3.1' class='none bg-danger'>
-            <td>
-                <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft3.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_ft3.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_cover_edit_books.py", line 91, in test_upload_jpg
-    self.assertTrue(self.check_element_on_page((By.ID, 'flash_alert')))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestDeleteDatabase</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c4', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt4.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestEbookConvert</td>
-        <td class="text-center">11</td>
-        <td class="text-center">11</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', 11)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt5.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_convert_deactivate</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_convert_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_convert_failed_and_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_convert_only</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_convert_parameter</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_convert_wrong_excecutable</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_email_failed</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_email_only</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_kindle_send_not_configured</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_ssl_smtp_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt5.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvert - test_starttls_smtp_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestEditAdditionalBooks</td>
-        <td class="text-center">5</td>
-        <td class="text-center">5</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('c6', 5)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt6.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadate_cbr</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_database</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
-        <td>TestEditBooks</td>
-        <td class="text-center">33</td>
-        <td class="text-center">30</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">2</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c7', 33)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt7.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_download_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_category</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_comments</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_publisher</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st7.14' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.14')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st7.14' 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_st7.14').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>
-        </tr>
-    
-    
-    
-        <tr id='pt7.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_rating</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_series</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_edit_title</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st7.18' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st7.18')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st7.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_st7.18').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>
-        </tr>
-    
-    
-    
-        <tr id='pt7.19' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_typeahead_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.20' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.21' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_typeahead_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.22' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.23' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_typeahead_series</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.24' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.25' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.26' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.27' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.28' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.29' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.30' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.31' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt7.32' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='ft7.33' class='none bg-danger'>
-            <td>
-                <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.33')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_ft7.33' 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_ft7.33').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_edit_books.py", line 735, in test_upload_cover_hdd
-    self.assertTrue(False, "Browser-Cache Problem: Old Cover is displayed instead of New Cover")
-AssertionError: False is not true : Browser-Cache Problem: Old Cover is displayed instead of New Cover</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestEditBooksGdrive</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt8.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksGdrive - test_config_gdrive</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestSTARTTLS</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('c9', 3)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt9.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt9.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt9.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestSSL</td>
-        <td class="text-center">4</td>
-        <td class="text-center">4</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', 4)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt10.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt10.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt10.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSSL - test_SSL_logging_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt10.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestSSL - test_SSL_only</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestGoodreads</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('c11', 3)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt11.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestGoodreads - test_author_page</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt11.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt11.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestGoodreads - test_goodreads_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestCalibreHelper</td>
-        <td class="text-center">16</td>
-        <td class="text-center">16</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('c12', 16)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt12.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_random_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestKoboSync</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('c13', 8)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt13.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_kobo_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_invalid</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_shelf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt13.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSync - test_sync_upload</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestLdapLogin</td>
-        <td class="text-center">10</td>
-        <td class="text-center">10</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('c14', 10)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt14.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="skipClass">
-        <td>TestLogging</td>
-        <td class="text-center">7</td>
-        <td class="text-center">6</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', 7)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt15.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogging - test_access_log_recover</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt15.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogging - test_debug_log</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt15.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogging - test_failed_login</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st15.4' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestLogging - test_failed_register</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st15.4')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st15.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_st15.4').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>
-        </tr>
-    
-    
-    
-        <tr id='pt15.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogging - test_logfile_change</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt15.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogging - test_logfile_recover</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt15.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogging - test_logviewer</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestLogin</td>
-        <td class="text-center">11</td>
-        <td class="text-center">11</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('c16', 11)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt16.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_digest_login</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_delete_admin</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_empty_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_locale_select</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_protected</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_remember_me</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_rename_user</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestLogin - test_robots</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestOAuthLogin</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">
-            <a onclick="showClassDetail('c17', 2)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt17.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt17.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestOPDSFeed</td>
-        <td class="text-center">20</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('c18', 20)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt18.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_random</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_search</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_series</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.19' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt18.20' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestOPDSFeed - test_recently_added</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestRegister</td>
-        <td class="text-center">7</td>
-        <td class="text-center">7</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('c19', 7)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt19.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestRegister - test_forgot_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt19.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestRegister - test_limit_domain</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt19.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestRegister - test_register_no_server</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt19.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestRegister - test_registering_only_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt19.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestRegister - test_registering_user</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt19.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestRegister - test_registering_user_fail</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt19.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestRegister - test_user_change_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="skipClass">
-        <td>TestShelf</td>
-        <td class="text-center">10</td>
-        <td class="text-center">9</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('c20', 10)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt20.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_arrange_shelf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_private_shelf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_public_private_shelf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_public_shelf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_rename_shelf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st20.9' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_database_change</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st20.9')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st20.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_st20.9').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Change Database Not Implemented</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt20.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_long_name</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="skipClass">
-        <td>TestUpdater</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('c21', 8)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt21.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt21.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt21.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt21.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt21.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt21.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st21.7' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st21.7')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id='div_st21.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_st21.7').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Takes too long</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt21.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_reconnect_database</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestUserTemplate</td>
-        <td class="text-center">19</td>
-        <td class="text-center">19</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('c22', 19)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt22.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_author_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_best_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_category_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_format_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_language_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_random_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_read_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_series_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt22.19' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">30</td>
-        <td class="text-center">30</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('c23', 30)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt23.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.19' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.20' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.21' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.22' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.23' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.24' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.25' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.26' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.27' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.28' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.29' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt23.30' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-    <tr id='total_row' class="text-center bg-grey">
-        <td>Total</td>
-        <td>230</td>
-        <td>222</td>
-        <td>2</td>
-        <td>0</td>
-        <td>6</td>
-        <td>&nbsp;</td>
-    </tr>
-</table>
-<div class="panel-group">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a class="accordion-toggle" data-toggle="collapse" href="#collapseOne">
-          <span class="glyphicon glyphicon-plus"></span>
-          Tested environment
-        </a>
-      </h4>
-    </div>
-    <div id="collapseOne" class="panel-collapse collapse">
-      <div class="panel-body">
-        <table id="libs" class="table">
-          <thead>
-            <tr>
-              <th>Program library</th>
-              <th>Installed Version</th>
-              <th>Test class</th>
-            </tr>
-          </thead>
-          <tbody>
-          
-            <tr>
-              <th>Platform</th>
-              <td>Linux 5.4.0-42-generic #46-Ubuntu SMP Fri Jul 10 00:24:02 UTC 2020 x86_64 x86_64</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Python</th>
-              <td>3.8.2</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Babel</th>
-              <td>2.8.0</td>
-              <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>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Flask-Babel</th>
-              <td>1.0.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Flask-Login</th>
-              <td>0.5.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>Flask-Principal</th>
-              <td>0.4.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>iso-639</th>
-              <td>0.4.5</td>
-              <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>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>pytz</th>
-              <td>2020.1</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>requests</th>
-              <td>2.23.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>singledispatch</th>
-              <td>3.4.0.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>six</th>
-              <td>1.15.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>SQLAlchemy</th>
-              <td>1.3.19</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>tornado</th>
-              <td>6.0.4</td>
-              <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>Pillow</th>
-              <td>7.2.0</td>
-              <td>TestCoverEditBooks</td>
-            </tr>
-          
-            <tr>
-              <th>comicapi</th>
-              <td>2.1.1</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>lxml</th>
-              <td>4.5.2</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>Pillow</th>
-              <td>7.2.0</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>rarfile</th>
-              <td>4.0</td>
-              <td>TestEditAdditionalBooks</td>
-            </tr>
-          
-            <tr>
-              <th>lxml</th>
-              <td>4.5.2</td>
-              <td>TestEditBooks</td>
-            </tr>
-          
-            <tr>
-              <th>Pillow</th>
-              <td>7.2.0</td>
-              <td>TestEditBooks</td>
-            </tr>
-          
-            <tr>
-              <th>google-api-python-client</th>
-              <td>1.11.0</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>httplib2</th>
-              <td>0.18.1</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>oauth2client</th>
-              <td>4.1.3</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyDrive</th>
-              <td>1.3.1</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>PyYAML</th>
-              <td>5.3.1</td>
-              <td>TestEditBooksGdrive</td>
-            </tr>
-          
-            <tr>
-              <th>goodreads</th>
-              <td>0.3.2</td>
-              <td>TestGoodreads</td>
-            </tr>
-          
-            <tr>
-              <th>jsonschema</th>
-              <td>3.2.0</td>
-              <td>TestKoboSync</td>
-            </tr>
-          
-            <tr>
-              <th>Flask-SimpleLDAP</th>
-              <td>1.4.0</td>
-              <td>TestLdapLogin</td>
-            </tr>
-          
-            <tr>
-              <th>jsonschema</th>
-              <td>3.2.0</td>
-              <td>TestLdapLogin</td>
-            </tr>
-          
-            <tr>
-              <th>python-ldap</th>
-              <td>3.3.1</td>
-              <td>TestLdapLogin</td>
-            </tr>
-          
-            <tr>
-              <th>Flask-Dance</th>
-              <td>3.0.0</td>
-              <td>TestOAuthLogin</td>
-            </tr>
-          
-            <tr>
-              <th>SQLAlchemy-Utils</th>
-              <td>0.36.8</td>
-              <td>TestOAuthLogin</td>
-            </tr>
-          
-          </tbody>
-        </table>
-      </div>
-    </div>
-  </div>
-</div>
-
-<script>
-    drawCircle(222, 2, 0, 6);
-</script>
-
-</div>
-
-<footer>
-<div id='foter' class="text-center">
-    <p>Made with HTMLTestRunner from https://github.com/oldani/HtmlTestRunner</p>
-</div>
-</footer>
-
-</body>
-</html>
\ No newline at end of file

From b564a97cdfc22c0e31e0ae18c6ed2b4320b40e50 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 16 Jan 2022 12:06:02 +0100
Subject: [PATCH 062/220] Update version Update testresult

---
 cps/constants.py                        |   2 +-
 test/Calibre-Web TestSummary_Linux.html | 357 ++++++++++++++++--------
 2 files changed, 248 insertions(+), 111 deletions(-)

diff --git a/cps/constants.py b/cps/constants.py
index e37ad900..9364fd79 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.15 Beta'}
+STABLE_VERSION = {'version': '0.6.15'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 94bab0c2..cf85c7cc 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-13 19:08:39</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-16 07:27:28</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>2022-01-13 23:00:09</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-16 11:19:00</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>3h 10 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 11 min</p>
         </div>
       </div>
       </div>
@@ -561,11 +561,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -593,33 +593,11 @@
     
     
     
-        <tr id="ft7.3" class="none bg-danger">
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 332, in test_convert_only
-    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1436,13 +1414,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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', 1)">Detail</a>
         </td>
@@ -1450,42 +1428,22 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     
     
-        <tr id="et13.1" class="none bg-info">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 133, in test_load_metadata
-    results[1][&#39;cover_element&#39;].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">19</td>
+        <td class="text-center">20</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c14', 20)">Detail</a>
@@ -1629,31 +1587,11 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="et14.16" class="none bg-info">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
-    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3309,12 +3247,12 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">4</td>
+        <td class="text-center">3</td>
         <td class="text-center">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c37', 9)">Detail</a>
@@ -3323,56 +3261,214 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id="ft37.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</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_ft37.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 223, in test_check_update_nightly_errors
+    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id="ft37.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</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_ft37.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 251, in test_check_update_nightly_request_errors
+    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id="ft37.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</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_ft37.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 141, in test_check_update_stable_errors
+    self.check_updater(&#39;Timeout&#39;,  &#34;alert&#34;, 13)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id="ft37.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</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_ft37.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft37.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 169, in test_check_update_stable_versions
+    self.check_updater(&#39;{}.{}.{}&#39;.format(*version3), &#34;alert-warning&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id="et37.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</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_et37.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 371, in test_perform_update
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id="et37.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</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_et37.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3412,11 +3508,46 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id="et37.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</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_et37.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 411, in test_update_write_protect
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4342,9 +4473,9 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>381</td>
-        <td>371</td>
-        <td>1</td>
-        <td>2</td>
+        <td>367</td>
+        <td>4</td>
+        <td>3</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4395,6 +4526,12 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>chardet</th>
+              <td>4.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Flask</th>
               <td>2.0.2</td>
@@ -4445,7 +4582,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>lxml</th>
-              <td>4.6.5</td>
+              <td>4.7.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4463,7 +4600,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>requests</th>
-              <td>2.24.0</td>
+              <td>2.27.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4481,7 +4618,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.2.0</td>
+              <td>1.3.2</td>
               <td>Basic</td>
             </tr>
           
@@ -4499,7 +4636,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4529,7 +4666,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4559,7 +4696,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4601,7 +4738,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4637,7 +4774,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.34.0</td>
+              <td>2.35.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4727,7 +4864,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
 </div>
 
 <script>
-    drawCircle(371, 1, 2, 7);
+    drawCircle(367, 4, 3, 7);
     showCase(5);
 </script>
 

From 01090169a795342626412955cd0aefea11ad4a2a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 16 Jan 2022 12:31:19 +0100
Subject: [PATCH 063/220] Version bump update dependencies in setup.cfg Update
 security bug list

---
 SECURITY.md      | 34 +++++++++++++++++++---------------
 cps/constants.py |  2 +-
 setup.cfg        |  1 +
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index bbaad7c4..c6f86607 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -10,21 +10,25 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 
 ## History
 
-| Fixed in  | Description  |CVE number |
-| ---------- |---------|---------|
-| 3rd July 2018 | Guest access acts as a backdoor||
-| V 0.6.7 |Hardcoded secret key for sessions |CVE-2020-12627 |
-| V 0.6.13|Calibre-Web Metadata cross site scripting |CVE-2021-25964|
-| V 0.6.13|Name of Shelves are only visible to users who can access the corresponding shelf Thanks to @ibarrionuevo||
-| V 0.6.13|JavaScript could get executed in the description field. Thanks to @ranjit-git  and Hagai Wechsler (WhiteSource)||
-| V 0.6.13|JavaScript could get executed in a custom column of type "comment" field ||
-| V 0.6.13|JavaScript could get executed after converting a book to another format with a title containing javascript code||
-| V 0.6.13|JavaScript could get executed after converting a book to another format with a username containing javascript code||
-| V 0.6.13|JavaScript could get executed in the description series, categories or publishers title||
-| V 0.6.13|JavaScript could get executed  in the shelf title||
-| V 0.6.13|Login with the old session cookie after logout. Thanks to @ibarrionuevo||
-| V 0.6.14|CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)  |CVE-2021-25965|
-| V 0.6.14|Cross-Site Scripting vulnerability on typeahead inputs. Thanks to @notdodo||
+| Fixed in      | Description                                                                                                        |CVE number |
+|---------------|--------------------------------------------------------------------------------------------------------------------|---------|
+| 3rd July 2018 | Guest access acts as a backdoor                                                                                    ||
+| V 0.6.7       | Hardcoded secret key for sessions                                                                                  |CVE-2020-12627 |
+| V 0.6.13      | Calibre-Web Metadata cross site scripting                                                                          |CVE-2021-25964|
+| V 0.6.13      | Name of Shelves are only visible to users who can access the corresponding shelf Thanks to @ibarrionuevo           ||
+| V 0.6.13      | JavaScript could get executed in the description field. Thanks to @ranjit-git  and Hagai Wechsler (WhiteSource)    ||
+| V 0.6.13      | JavaScript could get executed in a custom column of type "comment" field                                           ||
+| V 0.6.13      | JavaScript could get executed after converting a book to another format with a title containing javascript code    ||
+| V 0.6.13      | JavaScript could get executed after converting a book to another format with a username containing javascript code ||
+| V 0.6.13      | JavaScript could get executed in the description series, categories or publishers title                            ||
+| V 0.6.13      | JavaScript could get executed  in the shelf title                                                                  ||
+| V 0.6.13      | Login with the old session cookie after logout. Thanks to @ibarrionuevo                                            ||
+| V 0.6.14      | CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)                                              |CVE-2021-25965|
+| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                        ||
+| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                               ||
+| V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                           ||
+| V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo       ||
+| V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index 9364fd79..7fb973fc 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.15'}
+STABLE_VERSION = {'version': '0.6.16 Beta'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/setup.cfg b/setup.cfg
index 3a81dc2b..d372be87 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,6 +54,7 @@ install_requires =
 	unidecode>=0.04.19,<1.4.0
 	lxml>=3.8.0,<4.8.0
 	flask-wtf>=0.14.2,<1.1.0
+	chardet>=3.0.0,<4.1.0
 	
 
 [options.extras_require]

From de1bc3f9af089d324037a6cfd47eaea2f3fab793 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 17 Jan 2022 17:46:57 +0100
Subject: [PATCH 064/220] Fix #2265 (add book to shelf on popup for book
 details) Updated testresults

---
 cps/helper.py                           |   1 -
 cps/opds.py                             |   3 -
 cps/static/js/details.js                |   7 +-
 test/Calibre-Web TestSummary_Linux.html | 382 +++++++++---------------
 4 files changed, 148 insertions(+), 245 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index e8a0b738..5cfefe50 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -40,7 +40,6 @@ from werkzeug.security import generate_password_hash
 from markupsafe import escape
 from urllib.parse import quote
 
-
 try:
     import unidecode
     use_unidecode = True
diff --git a/cps/opds.py b/cps/opds.py
index 92c51d1b..8f4c5905 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -20,7 +20,6 @@
 #  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 sys
 import datetime
 from functools import wraps
 
@@ -35,8 +34,6 @@ from .pagination import Pagination
 from .web import render_read_books
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
-from babel import Locale as LC
-from babel.core import UnknownLocaleError
 
 opds = Blueprint('opds', __name__)
 
diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index 3a7def32..f559234e 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -61,8 +61,11 @@ $("#archived_cb").on("change", function() {
 
     $("#shelf-actions").on("click", "[data-shelf-action]", function (e) {
         e.preventDefault();
-
-        $.post(this.href)
+        $.ajax({
+                url: this.href,
+                method:"post",
+                data: {csrf_token:$("input[name='csrf_token']").val()},
+            })
             .done(function() {
                 var $this = $(this);
                 switch ($this.data("shelf-action")) {
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index cf85c7cc..6c3d98b4 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-16 07:27:28</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-16 21:58:58</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>2022-01-16 11:19:00</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-17 01:49:28</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>3h 11 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 10 min</p>
         </div>
       </div>
       </div>
@@ -411,11 +411,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -479,11 +479,33 @@
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id="ft6.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</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_ft6.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1414,11 +1436,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1428,21 +1450,41 @@
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</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.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</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">
@@ -1623,11 +1665,31 @@
     
     
     
-        <tr id='pt14.20' class='hiddenRow bg-success'>
+        <tr id="ft14.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</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_ft14.20')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4e213e83-fe57-4648-9e75-8e2176fe7773&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1825,15 +1887,15 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="skipClass">
         <td>TestFilePicker</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</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('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 3)">Detail</a>
         </td>
     </tr>
 
@@ -1847,6 +1909,41 @@
         </tr>
     
     
+    
+        <tr id="st20.2" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st20.2')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st20.2" 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_st20.2').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>
+        </tr>
+    
+    
+    
+        <tr id='pt20.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_two_filepickers</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -3247,12 +3344,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</td>
-        <td class="text-center">3</td>
+        <td class="text-center">8</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('c37', 9)">Detail</a>
@@ -3261,214 +3358,56 @@
 
     
     
-        <tr id="ft37.1" class="none bg-danger">
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 223, in test_check_update_nightly_errors
-    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-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>
     
     
     
-        <tr id="ft37.2" class="none bg-danger">
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 251, in test_check_update_nightly_request_errors
-    self.check_updater(&#39;Timeout&#39;, &#34;alert&#34;, 13)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-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>
     
     
     
-        <tr id="ft37.3" class="none bg-danger">
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 141, in test_check_update_stable_errors
-    self.check_updater(&#39;Timeout&#39;,  &#34;alert&#34;, 13)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-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>
     
     
     
-        <tr id="ft37.4" class="none bg-danger">
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft37.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft37.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 169, in test_check_update_stable_versions
-    self.check_updater(&#39;{}.{}.{}&#39;.format(*version3), &#34;alert-warning&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 75, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-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>
     
     
     
-        <tr id="et37.5" class="none bg-info">
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 371, in test_perform_update
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et37.6" class="none bg-info">
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3508,46 +3447,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id="et37.9" class="none bg-info">
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 411, in test_update_write_protect
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4472,11 +4376,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>381</td>
-        <td>367</td>
-        <td>4</td>
+        <td>383</td>
+        <td>372</td>
         <td>3</td>
-        <td>7</td>
+        <td>0</td>
+        <td>8</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4864,7 +4768,7 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 </div>
 
 <script>
-    drawCircle(367, 4, 3, 7);
+    drawCircle(372, 3, 0, 8);
     showCase(5);
 </script>
 

From a02f621f0830675cec4de0592408118b881c2404 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 17 Jan 2022 18:38:37 +0100
Subject: [PATCH 065/220] Added id for testability

---
 cps/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 8cb6b76e..ec69c91b 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -183,7 +183,7 @@
           </div>
           <div class="modal-body">...</div>
           <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
+            <button type="button" id="details_close" class="btn btn-default" data-dismiss="modal">{{_('Close')}}</button>
           </div>
         </div>
       </div>

From 6bf07539788004513c3692c074ebc7ba4ce005e1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 18 Jan 2022 17:39:54 +0100
Subject: [PATCH 066/220] Prevent wrong use of safe statement

---
 cps/templates/author.html               |   8 +-
 test/Calibre-Web TestSummary_Linux.html | 196 +++++++++++-------------
 2 files changed, 95 insertions(+), 109 deletions(-)

diff --git a/cps/templates/author.html b/cps/templates/author.html
index f2b71eab..d832ad5c 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -5,11 +5,11 @@
 {% if author is not none %}
 <section class="author-bio">
   {%if author.image_url is not none %}
-  <img title="{{author.name|safe}}" src="{{author.image_url}}" alt="{{author.name|safe}}" class="author-photo pull-left">
+  <img title="{{author.name}}" src="{{author.image_url}}" alt="{{author.name}}" class="author-photo pull-left">
   {% endif %}
 
   {%if author.about is not none %}
-  <p>{{author.about|safe}}</p>
+  <p>{{author.about}}</p>
   {% endif %}
 
   - {{_("via")}} <a href="{{author.link}}" class="author-link" target="_blank" rel="noopener">Goodreads</a>
@@ -36,7 +36,7 @@
     <div id="books" class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-            <span class="img" title="{{entry.title|safe}}">
+            <span class="img" title="{{entry.title}}">
               <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" />
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
@@ -98,7 +98,7 @@
 
 {% if other_books and author is not none %}
 <div class="discover">
-  <h3>{{_("More by")}} {{ author.name.replace('|',',')|safe }}</h3>
+  <h3>{{_("More by")}} {{ author.name.replace('|',',') }}</h3>
   <div class="row">
     {% for entry in other_books %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 6c3d98b4..978d371b 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-16 21:58:58</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-17 18:51:33</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>2022-01-17 01:49:28</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-18 07:49:35</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>3h 10 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>12h 17 min</p>
         </div>
       </div>
       </div>
@@ -411,11 +411,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -479,33 +479,11 @@
     
     
     
-        <tr id="ft6.7" class="none bg-danger">
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -738,13 +716,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">16</td>
-        <td class="text-center">14</td>
+        <td class="text-center">17</td>
+        <td class="text-center">15</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('c10', 16)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
@@ -779,7 +757,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -788,7 +766,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -797,7 +775,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -806,7 +784,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -815,7 +793,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -824,7 +802,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -833,7 +811,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -841,6 +819,15 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
         <tr id='pt10.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -849,19 +836,19 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="st10.12" class="none bg-warning">
+        <tr id="st10.13" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st10.13" 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.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -875,7 +862,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -884,7 +871,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='st10.14' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -893,7 +880,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.15' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -902,7 +889,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -1436,13 +1423,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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', 1)">Detail</a>
         </td>
@@ -1450,42 +1437,22 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
         <td class="text-center">19</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c14', 20)">Detail</a>
@@ -1629,11 +1596,41 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id="et14.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</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_et14.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et14.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 250, in test_edit_title
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1665,31 +1662,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id="ft14.20" class="none bg-danger">
+        <tr id='pt14.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4e213e83-fe57-4648-9e75-8e2176fe7773&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1865,13 +1842,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id="su" class="passClass">
         <td>TestErrorReadColumn</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 2)">Detail</a>
         </td>
     </tr>
 
@@ -1885,6 +1862,15 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         </tr>
     
     
+    
+        <tr id='pt19.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="skipClass">
@@ -4376,10 +4362,10 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>383</td>
-        <td>372</td>
-        <td>3</td>
+        <td>385</td>
+        <td>376</td>
         <td>0</td>
+        <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
     </tr>
@@ -4768,7 +4754,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 </div>
 
 <script>
-    drawCircle(372, 3, 0, 8);
+    drawCircle(376, 0, 1, 8);
     showCase(5);
 </script>
 

From 0c0313f375bed7b035c8c0482bbb09599e16bfcf Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 18 Jan 2022 17:55:10 +0100
Subject: [PATCH 067/220] Prevent creating a public shelf without permission

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

diff --git a/cps/shelf.py b/cps/shelf.py
index 29a4fe99..ad6a2665 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -248,7 +248,7 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
         if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
             flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
             return redirect(url_for('web.index'))
-        is_public = 1 if to_save.get("is_public") else 0
+        is_public = 1 if to_save.get("is_public") == "on" else 0
         if config.config_kobo_sync:
             shelf.kobo_sync = True if to_save.get("kobo_sync") else False
             if shelf.kobo_sync:

From 35209ede67622eeea4079e55bd41f3f1c06da7e7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 10:31:18 +0100
Subject: [PATCH 068/220] Update cover extraction with comicapi for webp files
 (fixes #2280)

---
 cps/comic.py                            |  28 ++---
 test/Calibre-Web TestSummary_Linux.html | 161 +++++++++++++++++-------
 2 files changed, 127 insertions(+), 62 deletions(-)

diff --git a/cps/comic.py b/cps/comic.py
index b094c60f..64711460 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -56,25 +56,25 @@ COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
 
 def _cover_processing(tmp_file_name, img, extension):
     tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
-    if use_IM:
-        # convert to jpg because calibre only supports jpg
-        if extension in NO_JPEG_EXTENSIONS:
-            with Image(filename=tmp_file_name) as imgc:
+    if extension in NO_JPEG_EXTENSIONS:
+        if use_IM:
+            with Image(blob=img) as imgc:
                 imgc.format = 'jpeg'
                 imgc.transform_colorspace('rgb')
-                imgc.save(tmp_cover_name)
+                imgc.save(filename=tmp_cover_name)
                 return tmp_cover_name
-
-    if not img:
+        else:
+            return None
+    if img:
+        with open(tmp_cover_name, 'wb') as f:
+            f.write(img)
+        return tmp_cover_name
+    else:
         return None
 
-    with open(tmp_cover_name, 'wb') as f:
-        f.write(img)
-    return tmp_cover_name
-
 
 def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable):
-    cover_data = None
+    cover_data = extension = None
     if original_file_extension.upper() == '.CBZ':
         cf = zipfile.ZipFile(tmp_file_name)
         for name in cf.namelist():
@@ -106,7 +106,7 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
                         break
         except Exception as ex:
             log.debug('Rarfile failed with error: %s', ex)
-    return cover_data
+    return cover_data, extension
 
 
 def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
@@ -121,7 +121,7 @@ def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
                     cover_data = archive.getPage(index)
                     break
     else:
-        cover_data = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
+        cover_data, extension = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
     return _cover_processing(tmp_file_name, cover_data, extension)
 
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 978d371b..84bdae18 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-17 18:51:33</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-18 21:11:17</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>2022-01-18 07:49:35</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-19 01:03:52</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>12h 17 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 12 min</p>
         </div>
       </div>
       </div>
@@ -1423,11 +1423,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1437,11 +1437,31 @@
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</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.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1613,19 +1633,9 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 250, in test_edit_title
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
+    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1998,11 +2008,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">11</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2084,11 +2094,31 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id="ft23.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</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_ft23.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
+    self.assertEqual(1, len(data), data)
+AssertionError: 1 != 0 : []</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2983,11 +3013,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3024,11 +3054,37 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id="ft33.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</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_ft33.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 219, in sound_test
+    self.assertEqual(duration, duration_item.text)
+AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
+- 0:02
+?    ^
++ 0:01
+?    ^</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3174,13 +3230,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
     <tr id="su" class="skipClass">
         <td>TestShelf</td>
+        <td class="text-center">15</td>
         <td class="text-center">14</td>
-        <td class="text-center">13</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('c36', 14)">Detail</a>
+            <a onclick="showClassDetail('c36', 15)">Detail</a>
         </td>
     </tr>
 
@@ -3224,7 +3280,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
+                <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3233,7 +3289,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_private_shelf</div>
+                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3242,7 +3298,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_public_private_shelf</div>
+                <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3251,7 +3307,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_public_shelf</div>
+                <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3260,7 +3316,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.9' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_rename_shelf</div>
+                <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3269,7 +3325,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
         <tr id='pt36.10' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
+                <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3277,6 +3333,15 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
         <tr id='pt36.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3285,19 +3350,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st36.12" class="none bg-warning">
+        <tr id="st36.13" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.12')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.12" class="popup_window test_output" style="display:none;">
+                <div id="div_st36.13" 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_st36.12').style.display='none'"><span
+                                onclick="document.getElementById('div_st36.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3311,7 +3376,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.13' class='hiddenRow bg-success'>
+        <tr id='pt36.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3320,7 +3385,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.14' class='hiddenRow bg-success'>
+        <tr id='pt36.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -4362,9 +4427,9 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>385</td>
-        <td>376</td>
-        <td>0</td>
+        <td>386</td>
+        <td>374</td>
+        <td>3</td>
         <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
@@ -4754,7 +4819,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 </div>
 
 <script>
-    drawCircle(376, 0, 1, 8);
+    drawCircle(374, 3, 1, 8);
     showCase(5);
 </script>
 

From 81b85445d859b3eff4e4c2089f071a65c2a9e036 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 11:51:34 +0100
Subject: [PATCH 069/220] Added missing unique marker on comments table (#2278)

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

diff --git a/cps/db.py b/cps/db.py
index 470ecc1c..ca8768f1 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -177,8 +177,8 @@ class Comments(Base):
     __tablename__ = 'comments'
 
     id = Column(Integer, primary_key=True)
+    book = Column(Integer, ForeignKey('books.id'), nullable=False, unique=True)
     text = Column(String(collation='NOCASE'), nullable=False)
-    book = Column(Integer, ForeignKey('books.id'), nullable=False)
 
     def __init__(self, text, book):
         self.text = text

From bbef41290fbfab94f16325cfadac03a3e7624ad7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 14:01:32 +0100
Subject: [PATCH 070/220] Fix delete book format wasn't working

---
 cps/static/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index cf5a4327..b10f0f98 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -204,7 +204,7 @@ $("#delete_confirm").click(function(event) {
     var bookFormat = $(this).data("delete-format");
     var ajaxResponse = $(this).data("ajax");
     if (bookFormat) {
-        window.location.href = getPath() + "/delete/" + deleteId + "/" + bookFormat;
+        postButton(event, getPath() + "/delete/" + deleteId + "/" + bookFormat);
     } else {
         if (ajaxResponse) {
             path = getPath() + "/ajax/delete/" + deleteId;

From d759df0df6248f1c79e31e580985138e4e10da60 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 18:23:08 +0100
Subject: [PATCH 071/220] Kobo sync token is now also created if accessed from
 localhost(fixes #1990) Create kobo sync token button is now "unclicked" after
 closing dialog Additional localhost route is catched If book format is
 deleted this also deletes the book synced to kobo status

---
 cps/admin.py                              | 12 ++---
 cps/editbooks.py                          |  1 +
 cps/kobo_auth.py                          | 62 ++++++++++-------------
 cps/static/js/main.js                     |  1 +
 cps/templates/generate_kobo_auth_url.html | 15 +++---
 5 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 706dce39..c1931ea4 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1426,14 +1426,14 @@ def _delete_user(content):
             for kobo_entry in kobo_entries:
                 ub.session.delete(kobo_entry)
             ub.session_commit()
-            log.info(u"User {} deleted".format(content.name))
-            return(_(u"User '%(nick)s' deleted", nick=content.name))
+            log.info("User {} deleted".format(content.name))
+            return(_("User '%(nick)s' deleted", nick=content.name))
         else:
-            log.warning(_(u"Can't delete Guest User"))
-            raise Exception(_(u"Can't delete Guest User"))
+            log.warning(_("Can't delete Guest User"))
+            raise Exception(_("Can't delete Guest User"))
     else:
-        log.warning(u"No admin user remaining, can't delete user")
-        raise Exception(_(u"No admin user remaining, can't delete user"))
+        log.warning("No admin user remaining, can't delete user")
+        raise Exception(_("No admin user remaining, can't delete user"))
 
 
 def _handle_edit_user(to_save, content, languages, translations, kobo_support):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 18248416..8ea00469 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,6 +341,7 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
+                    kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 8d46b26a..5668e6da 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -118,55 +118,49 @@ kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
 @kobo_auth.route("/generate_auth_token/<int:user_id>")
 @login_required
 def generate_auth_token(user_id):
+    warning = False
     host_list = request.host.rsplit(':')
     if len(host_list) == 1:
         host = ':'.join(host_list)
     else:
         host = ':'.join(host_list[0:-1])
-    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f'):
-        warning = _('PLease access calibre-web from non localhost to get valid api_endpoint for kobo device')
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            warning = warning
-        )
-    else:
-        # Invalidate any prevously generated Kobo Auth token for this user.
-        auth_token = ub.session.query(ub.RemoteAuthToken).filter(
-            ub.RemoteAuthToken.user_id == user_id
-        ).filter(ub.RemoteAuthToken.token_type==1).first()
+    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f') or host == "[::1]":
+        warning = _('Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device')
 
-        if not auth_token:
-            auth_token = ub.RemoteAuthToken()
-            auth_token.user_id = user_id
-            auth_token.expiration = datetime.max
-            auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
-            auth_token.token_type = 1
+    # Generate auth token if none is existing for this user
+    auth_token = ub.session.query(ub.RemoteAuthToken).filter(
+        ub.RemoteAuthToken.user_id == user_id
+    ).filter(ub.RemoteAuthToken.token_type==1).first()
 
-            ub.session.add(auth_token)
-            ub.session_commit()
+    if not auth_token:
+        auth_token = ub.RemoteAuthToken()
+        auth_token.user_id = user_id
+        auth_token.expiration = datetime.max
+        auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
+        auth_token.token_type = 1
 
-        books = calibre_db.session.query(db.Books).join(db.Data).all()
+        ub.session.add(auth_token)
+        ub.session_commit()
 
-        for book in books:
-            formats = [data.format for data in book.data]
-            if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
-                helper.convert_book_format(book.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.name)
+    books = calibre_db.session.query(db.Books).join(db.Data).all()
 
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            kobo_auth_url=url_for(
-                "kobo.TopLevelEndpoint", auth_token=auth_token.auth_token, _external=True
-            ),
-            warning = False
-        )
+    for book in books:
+        formats = [data.format for data in book.data]
+        if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
+            helper.convert_book_format(book.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.name)
+
+    return render_title_template(
+        "generate_kobo_auth_url.html",
+        title=_(u"Kobo Setup"),
+        auth_token=auth_token.auth_token,
+        warning = warning
+    )
 
 
 @kobo_auth.route("/deleteauthtoken/<int:user_id>", methods=["POST"])
 @login_required
 def delete_auth_token(user_id):
-    # Invalidate any prevously generated Kobo Auth token for this user.
+    # Invalidate any previously generated Kobo Auth token for this user
     ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == user_id)\
         .filter(ub.RemoteAuthToken.token_type==1).delete()
 
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index b10f0f98..75599d9b 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -535,6 +535,7 @@ $(function() {
 
     $("#modal_kobo_token")
         .on("show.bs.modal", function(e) {
+            $(e.relatedTarget).one('focus', function(e){$(this).blur();});
             var $modalBody = $(this).find(".modal-body");
 
             // Prevent static assets from loading multiple times
diff --git a/cps/templates/generate_kobo_auth_url.html b/cps/templates/generate_kobo_auth_url.html
index fb62424c..b8b74bda 100644
--- a/cps/templates/generate_kobo_auth_url.html
+++ b/cps/templates/generate_kobo_auth_url.html
@@ -1,12 +1,15 @@
 {% extends "fragment.html" %}
 {% block body %}
 <div class="well">
-  <p>
-    {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}</a>
+<p>
+  {% if not warning %}
+      {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}
+    </p><p>
+      api_endpoint={{url_for("kobo.TopLevelEndpoint", auth_token=auth_token, _external=True)}}
+  {% else %}
+      {{warning}}
+    </p><p>{{_('Kobo Token:')}} {{ auth_token }}
+  {% endif %}
   </p>
-  <p>
-    {% if not warning %}api_endpoint={{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
-  </p>
-  <p>
 </div>
 {% endblock %}

From bc7a305285543c633280d511abed9056f082965b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:11:02 +0100
Subject: [PATCH 072/220] Deleted book formats remove book from synced to kobo
 table updated teststatus

---
 cps/editbooks.py                        |   3 +-
 cps/helper.py                           |  14 +-
 cps/kobo_sync_status.py                 |  13 +-
 cps/tasks/convert.py                    |   8 +-
 cps/ub.py                               |  15 +-
 test/Calibre-Web TestSummary_Linux.html | 226 ++++++++++--------------
 6 files changed, 128 insertions(+), 151 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 8ea00469..f0b8fb41 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,7 +341,8 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
-                    kobo_sync_status.remove_synced_book(book.id, True)
+                    if book_format.upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/helper.py b/cps/helper.py
index 5cfefe50..622af817 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -17,18 +17,18 @@
 #  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 sys
 import os
 import io
 import mimetypes
 import re
 import shutil
-import time
+import socket
 import unicodedata
 from datetime import datetime, timedelta
 from tempfile import gettempdir
-
+from urllib.parse import urlparse
 import requests
+
 from babel.dates import format_datetime
 from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
@@ -584,10 +584,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
+        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+            log.error("Localhost was accessed for cover upload")
+            return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)
-    except (requests.exceptions.HTTPError,
+    except (socket.gaierror,
+            requests.exceptions.HTTPError,
             requests.exceptions.ConnectionError,
             requests.exceptions.Timeout) as ex:
         log.info(u'Cover Download Error %s', ex)
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index 6df0a503..2e99394b 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -21,6 +21,7 @@ from flask_login import current_user
 from . import ub
 import datetime
 from sqlalchemy.sql.expression import or_, and_, true
+from sqlalchemy import exc
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -36,14 +37,18 @@ def add_synced_books(book_id):
 
 
 # Select all entries of current book in kobo_synced_books table, which are from current user and delete them
-def remove_synced_book(book_id, all=False):
+def remove_synced_book(book_id, all=False, session=None):
     if not all:
         user = ub.KoboSyncedBooks.user_id == current_user.id
     else:
         user = true()
-    ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id) \
-        .filter(user).delete()
-    ub.session_commit()
+    if not session:
+        ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit()
+    else:
+        session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit(sess=session)
+
 
 
 def change_archived_books(book_id, state=None, message=None):
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 59ad6909..596bf95c 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -16,7 +16,6 @@
 #  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 sys
 import os
 import re
 
@@ -31,7 +30,8 @@ from cps import db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
-from flask import url_for
+from cps.kobo_sync_status import remove_synced_book
+from cps.ub import ini
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
@@ -147,6 +147,10 @@ class TaskConvert(CalibreTask):
                 try:
                     local_db.session.merge(new_format)
                     local_db.session.commit()
+                    if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        ub_session = ini()
+                        remove_synced_book(book_id, True, ub_session)
+                        ub_session.close()
                 except SQLAlchemyError as e:
                     local_db.session.rollback()
                     log.error("Database error: %s", e)
diff --git a/cps/ub.py b/cps/ub.py
index 1d5db58a..27e9ef8f 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -773,6 +773,14 @@ def create_admin_user(session):
     except Exception:
         session.rollback()
 
+def ini():
+    global app_DB_path
+    engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
+
+    Session = scoped_session(sessionmaker())
+    Session.configure(bind=engine)
+    return Session()
+
 
 def init_db(app_db_path):
     # Open session for database connection
@@ -830,12 +838,13 @@ def dispose():
             except Exception:
                 pass
 
-def session_commit(success=None):
+def session_commit(success=None, sess=None):
+    s = sess if sess else session
     try:
-        session.commit()
+        s.commit()
         if success:
             log.info(success)
     except (exc.OperationalError, exc.InvalidRequestError) as e:
-        session.rollback()
+        s.rollback()
         log.debug_or_exception(e)
     return ""
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 84bdae18..652248a2 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-18 21:11:17</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-23 05:50:54</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>2022-01-19 01:03:52</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-23 10:25:22</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>3h 12 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 54 min</p>
         </div>
       </div>
       </div>
@@ -714,15 +714,15 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</td>
         <td class="text-center">15</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 17)">Detail</a>
+            <a onclick="showClassDetail('c10', 18)">Detail</a>
         </td>
     </tr>
 
@@ -809,7 +809,36 @@
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id="et10.10" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 59, in test_upload_cbz_coverformats
+    original_cover = self.check_element_on_page((By.ID, &#34;detailcover&#34;)).screenshot_as_png
+AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -818,7 +847,7 @@
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -827,7 +856,7 @@
     
     
     
-        <tr id='pt10.12' class='hiddenRow bg-success'>
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -836,19 +865,19 @@
     
     
     
-        <tr id="st10.13" class="none bg-warning">
+        <tr id="st10.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.13')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.13" class="popup_window test_output" style="display:none;">
+                <div id="div_st10.14" 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.13').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -862,7 +891,7 @@
     
     
     
-        <tr id='pt10.14' class='hiddenRow bg-success'>
+        <tr id='pt10.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -871,7 +900,7 @@
     
     
     
-        <tr id='st10.15' class='none bg-warning'>
+        <tr id='st10.16' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -880,7 +909,7 @@
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -889,7 +918,7 @@
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt10.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -901,13 +930,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
+        <td class="text-center">36</td>
         <td class="text-center">35</td>
-        <td class="text-center">34</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('c11', 35)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
@@ -1237,6 +1266,15 @@
     
     
         <tr id='pt11.35' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1423,13 +1461,13 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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', 1)">Detail</a>
         </td>
@@ -1437,42 +1475,22 @@
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">19</td>
+        <td class="text-center">20</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c14', 20)">Detail</a>
@@ -1616,31 +1634,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id="et14.16" class="none bg-info">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
-    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2008,11 +2006,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2094,31 +2092,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id="ft23.9" class="none bg-danger">
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
-    self.assertEqual(1, len(data), data)
-AssertionError: 1 != 0 : []</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3013,11 +2991,11 @@ AssertionError: 1 != 0 : []</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3054,37 +3032,11 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="ft33.4" class="none bg-danger">
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 219, in sound_test
-    self.assertEqual(duration, duration_item.text)
-AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
-- 0:02
-?    ^
-+ 0:01
-?    ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4427,9 +4379,9 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>386</td>
-        <td>374</td>
-        <td>3</td>
+        <td>388</td>
+        <td>379</td>
+        <td>0</td>
         <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
@@ -4459,7 +4411,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-25-generic #26~20.04.1-Ubuntu SMP Fri Jan 7 16:27:40 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4561,7 +4513,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.29</td>
+              <td>1.4.31</td>
               <td>Basic</td>
             </tr>
           
@@ -4591,7 +4543,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4621,7 +4573,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4651,7 +4603,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4681,7 +4633,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>comicapi</th>
-              <td>2.2.0</td>
+              <td>2.2.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -4693,7 +4645,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4729,7 +4681,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4819,7 +4771,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 </div>
 
 <script>
-    drawCircle(374, 3, 1, 8);
+    drawCircle(379, 0, 1, 8);
     showCase(5);
 </script>
 

From ede273a8f9669089449416d23ab81a6dd66306f4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:43:35 +0100
Subject: [PATCH 073/220] Added variable to allow loading cover from localhost

---
 cps/cli.py    |  3 +++
 cps/helper.py | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cps/cli.py b/cps/cli.py
index 3685e8e2..31ea8417 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -45,6 +45,7 @@ parser.add_argument('-v', '--version', action='version', help='Shows version num
 parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
 parser.add_argument('-s', metavar='user:pass', help='Sets specific username to new password')
 parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
+parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
 args = parser.parse_args()
 
 settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
@@ -77,6 +78,8 @@ if (args.k and not args.c) or (not args.k and args.c):
 if args.k == "":
     keyfilepath = ""
 
+# load covers from localhost
+allow_localhost = args.l or None
 # handle and check ip address argument
 ip_address = args.i or None
 if ip_address:
diff --git a/cps/helper.py b/cps/helper.py
index 622af817..2cfb119b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -46,7 +46,7 @@ try:
 except ImportError:
     use_unidecode = False
 
-from . import calibre_db
+from . import calibre_db, cli
 from .tasks.convert import TaskConvert
 from . import logger, config, get_locale, db, ub
 from . import gdriveutils as gd
@@ -584,11 +584,12 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
-        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
-            log.error("Localhost was accessed for cover upload")
-            return False, _("You are not allowed to access localhost for cover uploads")
+        if not cli.allow_localhost:
+            # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+            ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+                log.error("Localhost was accessed for cover upload")
+                return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)

From d8f5bdea6df3a0217f49062d4209cedc80caad0e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 19:31:56 +0100
Subject: [PATCH 074/220] Refactor rename author/title on gdrive

---
 cps/gdriveutils.py        | 48 +++++++++++++++++-----
 cps/helper.py             | 86 +++++++++++++++++++++++++++------------
 optional-requirements.txt |  4 +-
 setup.cfg                 |  4 +-
 4 files changed, 102 insertions(+), 40 deletions(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index c4445944..38cbd74f 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -355,23 +355,51 @@ def downloadFile(path, filename, output):
     f = getFileFromEbooksFolder(path, filename)
     f.GetContentFile(output)
 
+'''def renameGdriveFolderRemote(origin_file, target_folder):
+    drive = getDrive(Gdrive.Instance().drive)
+    previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
+    children = drive.auth.service.children().list(folderId=previous_parents).execute()
+    gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
+    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
+        # Folder is not existing, rename folder
+        drive.auth.service.files().patch(fileId=origin_file['id'],
+                                         body={'title': target_folder},
+                                         fields='title').execute()
+        # gFileTargetDir = drive.CreateFile(
+        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
+        #     "mimeType": "application/vnd.google-apps.folder"})
+        # gFileTargetDir.Upload()
+    else:
+        # Move the file to the new folder
+        drive.auth.service.files().update(fileId=origin_file['id'],
+                                          addParents=gFileTargetDir['id'],
+                                          removeParents=previous_parents,
+                                          fields='id, parents').execute()
+    # if previous_parents has no children anymore, delete original fileparent
+    if len(children['items']) == 1:
+        deleteDatabaseEntry(previous_parents)
+        drive.auth.service.files().delete(fileId=previous_parents).execute()'''
 
 def moveGdriveFolderRemote(origin_file, target_folder):
     drive = getDrive(Gdrive.Instance().drive)
     previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
     children = drive.auth.service.children().list(folderId=previous_parents).execute()
     gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
-    if not gFileTargetDir:
+    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
         # Folder is not existing, create, and move folder
-        gFileTargetDir = drive.CreateFile(
-            {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
-             "mimeType": "application/vnd.google-apps.folder"})
-        gFileTargetDir.Upload()
-    # Move the file to the new folder
-    drive.auth.service.files().update(fileId=origin_file['id'],
-                                      addParents=gFileTargetDir['id'],
-                                      removeParents=previous_parents,
-                                      fields='id, parents').execute()
+        drive.auth.service.files().patch(fileId=origin_file['id'],
+                                         body={'title': target_folder},
+                                         fields='title').execute()
+        #gFileTargetDir = drive.CreateFile(
+        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
+        #     "mimeType": "application/vnd.google-apps.folder"})
+        #gFileTargetDir.Upload()
+    else:
+        # Move the file to the new folder
+        drive.auth.service.files().update(fileId=origin_file['id'],
+                                          addParents=gFileTargetDir['id'],
+                                          removeParents=previous_parents,
+                                          fields='id, parents').execute()
     # if previous_parents has no children anymore, delete original fileparent
     if len(children['items']) == 1:
         deleteDatabaseEntry(previous_parents)
diff --git a/cps/helper.py b/cps/helper.py
index 29c9e3bf..4dea4e67 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -331,7 +331,7 @@ def delete_book_file(book, calibrepath, book_format=None):
                    path=book.path)
 
 
-def clean_author_database(renamed_author, calibrepath, local_book=None):
+def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=None):
     valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
     for r in renamed_author:
         if local_book:
@@ -350,9 +350,19 @@ def clean_author_database(renamed_author, calibrepath, local_book=None):
                 # change location in database to new author/title path
                 book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
                 for file_format in book.data:
-                    shutil.move(os.path.normcase(
-                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
-                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
+                    if not gdrive:
+                        shutil.move(os.path.normcase(os.path.join(all_new_path,
+                                                                  file_format.name + '.' + file_format.format.lower())),
+                            os.path.normcase(os.path.join(all_new_path,
+                                                          all_new_name + '.' + file_format.format.lower())))
+                    else:
+                        gFile = gd.getFileFromEbooksFolder(all_new_path,
+                                                           file_format.name + '.' + file_format.format.lower())
+                        if gFile:
+                            gd.moveGdriveFileRemote(gFile, all_new_name + u'.' + file_format.format.lower())
+                        else:
+                            log.error("File {} not found on gdrive"
+                                      .format(all_new_path, file_format.name + '.' + file_format.format.lower()))
                     file_format.name = all_new_name
 
 
@@ -461,23 +471,18 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r)
             new_author_rename_dir = get_valid_filename(new_author.name)
-            '''if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
-                try:
-                    old_author_path = os.path.join(calibrepath, old_author_dir)
-                    new_author_path = os.path.join(calibrepath, new_author_rename_dir)
-                    shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
-                except (OSError) as ex:
-                    log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
-                    log.debug(ex, exc_info=True)
-                    return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
-                             src=old_author_path, dest=new_author_path, error=str(ex))'''
+            gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
+            if gFile:
+                gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
+            else:
+                error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
         new_authordir = get_valid_filename(book.authors[0].name)
 
     titledir = book.path.split('/')[1]
     new_titledir = get_valid_filename(book.title) + u" (" + str(book_id) + u")"
 
-    if titledir != new_titledir:
+    '''if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
         if gFile:
             gFile['title'] = new_titledir
@@ -496,10 +501,47 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_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'''
+
+    if authordir != new_authordir or titledir != new_titledir:
+        new_path = os.path.join(new_authordir, new_titledir)
+        new_name = get_valid_filename(book.title) + ' - ' + get_valid_filename(new_authordir)
+        gFile = gd.getFileFromEbooksFolder(new_authordir, new_titledir)
+        if not gFile:
+            # move original path to new path
+            log.debug("Moving title: %s to %s", path, new_path)
+            gFile = gd.getFileFromEbooksFolder(authordir, titledir)
+            # move author and title  -> currently only title??
+            gd.moveGdriveFileRemote(gFile, new_titledir)
+            # shutil.move(os.path.normcase(path), os.path.normcase(new_path))
+        else:  # path is valid copy only files to new location (merge)
+            log.info("Moving title: %s into existing: %s", path, new_path)
+            # Take all files and subfolder from old path (strange command)
+            # gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
+            for dir_name, __, file_list in os.walk(path):
+                for file in file_list:
+                    shutil.move(os.path.normcase(os.path.join(dir_name, file)),
+                                os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
+    # change location in database to new author/title path
+    book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
+
+    #for file_format in book.data:
+    #        gFile = gd.getFileFromEbooksFolder(path, file_format.name + '.' + file_format.format.lower())
+    #        if not gFile:
+    #           error = _(u'File %(file)s not found on Google Drive', file=file_format.name)  # file not found
+    #            break
+    #        gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
+    #        file_format.name = new_name
+
     # Todo: Rename all authors on gdrive
     # Rename all files from old names to new names
-    '''
+    clean_author_database(renamed_author, "")
+    if first_author not in renamed_author:
+        clean_author_database([first_author], "", book)
+    #if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+    #        shutil.rmtree(os.path.dirname(path))
+
+    '''# Rename all files from old names to new names
     try:
         clean_author_database(renamed_author, calibrepath)
         if first_author not in renamed_author:
@@ -510,15 +552,7 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
         log.error("Error in rename file in path %s", ex)
         log.debug(ex, exc_info=True)
         return _("Error in rename file in path: %(error)s", error=str(ex))'''
-    if authordir != new_authordir or titledir != new_titledir:
-        new_name = get_valid_filename(book.title) + u' - ' + get_valid_filename(new_authordir)
-        for file_format in book.data:
-            gFile = gd.getFileFromEbooksFolder(path, file_format.name + u'.' + file_format.format.lower())
-            if not gFile:
-                error = _(u'File %(file)s not found on Google Drive', file=file_format.name)  # file not found
-                break
-            gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
-            file_format.name = new_name
+
     return error
 
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 92a01488..2ebcf1a7 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -14,7 +14,7 @@ six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index d372be87..db2fd3e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -59,7 +59,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -73,7 +73,7 @@ gdrive =
 	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From e8e2f789e5f58275f230df92e0fce7cbeb798ed0 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 24 Jan 2022 12:37:15 +0100
Subject: [PATCH 075/220] Fix #2287 (books can't be added to shelf from search)

---
 cps/templates/search.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cps/templates/search.html b/cps/templates/search.html
index 32339803..74592587 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -9,6 +9,7 @@
       {% if g.user.is_authenticated %}
         {% if g.user.shelf.all() or g.shelves_access %}
           <div id="shelf-actions" class="btn-toolbar" role="toolbar">
+            <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
             <div class="btn-group" role="group" aria-label="Add to shelves">
               <button id="add-to-shelf" type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <span class="glyphicon glyphicon-list"></span> {{_('Add to shelf')}}

From 3b216bfa07ec7992eff03e55d61732af6df9bb92 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 22 Jan 2022 18:23:08 +0100
Subject: [PATCH 076/220] Kobo sync token is now also created if accessed from
 localhost(fixes #1990) Create kobo sync token button is now "unclicked" after
 closing dialog Additional localhost route is catched If book format is
 deleted this also deletes the book synced to kobo status

---
 cps/admin.py                              | 12 ++---
 cps/editbooks.py                          |  1 +
 cps/kobo_auth.py                          | 62 ++++++++++-------------
 cps/static/js/main.js                     |  1 +
 cps/templates/generate_kobo_auth_url.html | 15 +++---
 5 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 706dce39..c1931ea4 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1426,14 +1426,14 @@ def _delete_user(content):
             for kobo_entry in kobo_entries:
                 ub.session.delete(kobo_entry)
             ub.session_commit()
-            log.info(u"User {} deleted".format(content.name))
-            return(_(u"User '%(nick)s' deleted", nick=content.name))
+            log.info("User {} deleted".format(content.name))
+            return(_("User '%(nick)s' deleted", nick=content.name))
         else:
-            log.warning(_(u"Can't delete Guest User"))
-            raise Exception(_(u"Can't delete Guest User"))
+            log.warning(_("Can't delete Guest User"))
+            raise Exception(_("Can't delete Guest User"))
     else:
-        log.warning(u"No admin user remaining, can't delete user")
-        raise Exception(_(u"No admin user remaining, can't delete user"))
+        log.warning("No admin user remaining, can't delete user")
+        raise Exception(_("No admin user remaining, can't delete user"))
 
 
 def _handle_edit_user(to_save, content, languages, translations, kobo_support):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 18248416..8ea00469 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,6 +341,7 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
+                    kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 8d46b26a..5668e6da 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -118,55 +118,49 @@ kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
 @kobo_auth.route("/generate_auth_token/<int:user_id>")
 @login_required
 def generate_auth_token(user_id):
+    warning = False
     host_list = request.host.rsplit(':')
     if len(host_list) == 1:
         host = ':'.join(host_list)
     else:
         host = ':'.join(host_list[0:-1])
-    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f'):
-        warning = _('PLease access calibre-web from non localhost to get valid api_endpoint for kobo device')
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            warning = warning
-        )
-    else:
-        # Invalidate any prevously generated Kobo Auth token for this user.
-        auth_token = ub.session.query(ub.RemoteAuthToken).filter(
-            ub.RemoteAuthToken.user_id == user_id
-        ).filter(ub.RemoteAuthToken.token_type==1).first()
+    if host.startswith('127.') or host.lower() == 'localhost' or host.startswith('[::ffff:7f') or host == "[::1]":
+        warning = _('Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device')
 
-        if not auth_token:
-            auth_token = ub.RemoteAuthToken()
-            auth_token.user_id = user_id
-            auth_token.expiration = datetime.max
-            auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
-            auth_token.token_type = 1
+    # Generate auth token if none is existing for this user
+    auth_token = ub.session.query(ub.RemoteAuthToken).filter(
+        ub.RemoteAuthToken.user_id == user_id
+    ).filter(ub.RemoteAuthToken.token_type==1).first()
 
-            ub.session.add(auth_token)
-            ub.session_commit()
+    if not auth_token:
+        auth_token = ub.RemoteAuthToken()
+        auth_token.user_id = user_id
+        auth_token.expiration = datetime.max
+        auth_token.auth_token = (hexlify(urandom(16))).decode("utf-8")
+        auth_token.token_type = 1
 
-        books = calibre_db.session.query(db.Books).join(db.Data).all()
+        ub.session.add(auth_token)
+        ub.session_commit()
 
-        for book in books:
-            formats = [data.format for data in book.data]
-            if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
-                helper.convert_book_format(book.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.name)
+    books = calibre_db.session.query(db.Books).join(db.Data).all()
 
-        return render_title_template(
-            "generate_kobo_auth_url.html",
-            title=_(u"Kobo Setup"),
-            kobo_auth_url=url_for(
-                "kobo.TopLevelEndpoint", auth_token=auth_token.auth_token, _external=True
-            ),
-            warning = False
-        )
+    for book in books:
+        formats = [data.format for data in book.data]
+        if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
+            helper.convert_book_format(book.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.name)
+
+    return render_title_template(
+        "generate_kobo_auth_url.html",
+        title=_(u"Kobo Setup"),
+        auth_token=auth_token.auth_token,
+        warning = warning
+    )
 
 
 @kobo_auth.route("/deleteauthtoken/<int:user_id>", methods=["POST"])
 @login_required
 def delete_auth_token(user_id):
-    # Invalidate any prevously generated Kobo Auth token for this user.
+    # Invalidate any previously generated Kobo Auth token for this user
     ub.session.query(ub.RemoteAuthToken).filter(ub.RemoteAuthToken.user_id == user_id)\
         .filter(ub.RemoteAuthToken.token_type==1).delete()
 
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index b10f0f98..75599d9b 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -535,6 +535,7 @@ $(function() {
 
     $("#modal_kobo_token")
         .on("show.bs.modal", function(e) {
+            $(e.relatedTarget).one('focus', function(e){$(this).blur();});
             var $modalBody = $(this).find(".modal-body");
 
             // Prevent static assets from loading multiple times
diff --git a/cps/templates/generate_kobo_auth_url.html b/cps/templates/generate_kobo_auth_url.html
index fb62424c..b8b74bda 100644
--- a/cps/templates/generate_kobo_auth_url.html
+++ b/cps/templates/generate_kobo_auth_url.html
@@ -1,12 +1,15 @@
 {% extends "fragment.html" %}
 {% block body %}
 <div class="well">
-  <p>
-    {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}</a>
+<p>
+  {% if not warning %}
+      {{_('Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):')}}
+    </p><p>
+      api_endpoint={{url_for("kobo.TopLevelEndpoint", auth_token=auth_token, _external=True)}}
+  {% else %}
+      {{warning}}
+    </p><p>{{_('Kobo Token:')}} {{ auth_token }}
+  {% endif %}
   </p>
-  <p>
-    {% if not warning %}api_endpoint={{kobo_auth_url}}{% else %}{{warning}}{% endif %}</a>
-  </p>
-  <p>
 </div>
 {% endblock %}

From 35f6f4c727c887f8f3607fe3233dbc1980d15020 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:11:02 +0100
Subject: [PATCH 077/220] Deleted book formats remove book from synced to kobo
 table updated teststatus

---
 cps/editbooks.py                        |   3 +-
 cps/helper.py                           |  14 +-
 cps/kobo_sync_status.py                 |  13 +-
 cps/tasks/convert.py                    |   8 +-
 cps/ub.py                               |  15 +-
 test/Calibre-Web TestSummary_Linux.html | 226 ++++++++++--------------
 6 files changed, 128 insertions(+), 151 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 8ea00469..f0b8fb41 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -341,7 +341,8 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                 else:
                     calibre_db.session.query(db.Data).filter(db.Data.book == book.id).\
                         filter(db.Data.format == book_format).delete()
-                    kobo_sync_status.remove_synced_book(book.id, True)
+                    if book_format.upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
                 log.debug_or_exception(ex)
diff --git a/cps/helper.py b/cps/helper.py
index 5cfefe50..622af817 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -17,18 +17,18 @@
 #  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 sys
 import os
 import io
 import mimetypes
 import re
 import shutil
-import time
+import socket
 import unicodedata
 from datetime import datetime, timedelta
 from tempfile import gettempdir
-
+from urllib.parse import urlparse
 import requests
+
 from babel.dates import format_datetime
 from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
@@ -584,10 +584,16 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
+        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+            log.error("Localhost was accessed for cover upload")
+            return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)
-    except (requests.exceptions.HTTPError,
+    except (socket.gaierror,
+            requests.exceptions.HTTPError,
             requests.exceptions.ConnectionError,
             requests.exceptions.Timeout) as ex:
         log.info(u'Cover Download Error %s', ex)
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index 6df0a503..2e99394b 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -21,6 +21,7 @@ from flask_login import current_user
 from . import ub
 import datetime
 from sqlalchemy.sql.expression import or_, and_, true
+from sqlalchemy import exc
 
 # Add the current book id to kobo_synced_books table for current user, if entry is already present,
 # do nothing (safety precaution)
@@ -36,14 +37,18 @@ def add_synced_books(book_id):
 
 
 # Select all entries of current book in kobo_synced_books table, which are from current user and delete them
-def remove_synced_book(book_id, all=False):
+def remove_synced_book(book_id, all=False, session=None):
     if not all:
         user = ub.KoboSyncedBooks.user_id == current_user.id
     else:
         user = true()
-    ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id) \
-        .filter(user).delete()
-    ub.session_commit()
+    if not session:
+        ub.session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit()
+    else:
+        session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
+        ub.session_commit(sess=session)
+
 
 
 def change_archived_books(book_id, state=None, message=None):
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 59ad6909..596bf95c 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -16,7 +16,6 @@
 #  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 sys
 import os
 import re
 
@@ -31,7 +30,8 @@ from cps import db
 from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
-from flask import url_for
+from cps.kobo_sync_status import remove_synced_book
+from cps.ub import ini
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
@@ -147,6 +147,10 @@ class TaskConvert(CalibreTask):
                 try:
                     local_db.session.merge(new_format)
                     local_db.session.commit()
+                    if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                        ub_session = ini()
+                        remove_synced_book(book_id, True, ub_session)
+                        ub_session.close()
                 except SQLAlchemyError as e:
                     local_db.session.rollback()
                     log.error("Database error: %s", e)
diff --git a/cps/ub.py b/cps/ub.py
index 1d5db58a..27e9ef8f 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -773,6 +773,14 @@ def create_admin_user(session):
     except Exception:
         session.rollback()
 
+def ini():
+    global app_DB_path
+    engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
+
+    Session = scoped_session(sessionmaker())
+    Session.configure(bind=engine)
+    return Session()
+
 
 def init_db(app_db_path):
     # Open session for database connection
@@ -830,12 +838,13 @@ def dispose():
             except Exception:
                 pass
 
-def session_commit(success=None):
+def session_commit(success=None, sess=None):
+    s = sess if sess else session
     try:
-        session.commit()
+        s.commit()
         if success:
             log.info(success)
     except (exc.OperationalError, exc.InvalidRequestError) as e:
-        session.rollback()
+        s.rollback()
         log.debug_or_exception(e)
     return ""
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 84bdae18..652248a2 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-18 21:11:17</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-23 05:50:54</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>2022-01-19 01:03:52</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-23 10:25:22</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>3h 12 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 54 min</p>
         </div>
       </div>
       </div>
@@ -714,15 +714,15 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">17</td>
+        <td class="text-center">18</td>
         <td class="text-center">15</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 17)">Detail</a>
+            <a onclick="showClassDetail('c10', 18)">Detail</a>
         </td>
     </tr>
 
@@ -809,7 +809,36 @@
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id="et10.10" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 59, in test_upload_cbz_coverformats
+    original_cover = self.check_element_on_page((By.ID, &#34;detailcover&#34;)).screenshot_as_png
+AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -818,7 +847,7 @@
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -827,7 +856,7 @@
     
     
     
-        <tr id='pt10.12' class='hiddenRow bg-success'>
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -836,19 +865,19 @@
     
     
     
-        <tr id="st10.13" class="none bg-warning">
+        <tr id="st10.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.13')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.13" class="popup_window test_output" style="display:none;">
+                <div id="div_st10.14" 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.13').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -862,7 +891,7 @@
     
     
     
-        <tr id='pt10.14' class='hiddenRow bg-success'>
+        <tr id='pt10.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -871,7 +900,7 @@
     
     
     
-        <tr id='st10.15' class='none bg-warning'>
+        <tr id='st10.16' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -880,7 +909,7 @@
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -889,7 +918,7 @@
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt10.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -901,13 +930,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
+        <td class="text-center">36</td>
         <td class="text-center">35</td>
-        <td class="text-center">34</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('c11', 35)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
@@ -1237,6 +1266,15 @@
     
     
         <tr id='pt11.35' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1423,13 +1461,13 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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', 1)">Detail</a>
         </td>
@@ -1437,42 +1475,22 @@
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">19</td>
+        <td class="text-center">20</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c14', 20)">Detail</a>
@@ -1616,31 +1634,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id="et14.16" class="none bg-info">
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 245, in test_edit_title
-    self.assertEqual(ele.text, u&#39;Very long extra super turbo cool title without any issue of displaying including ö utf-8 characters&#39;)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2008,11 +2006,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2094,31 +2092,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id="ft23.9" class="none bg-danger">
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
-    self.assertEqual(1, len(data), data)
-AssertionError: 1 != 0 : []</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3013,11 +2991,11 @@ AssertionError: 1 != 0 : []</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3054,37 +3032,11 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="ft33.4" class="none bg-danger">
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 219, in sound_test
-    self.assertEqual(duration, duration_item.text)
-AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
-- 0:02
-?    ^
-+ 0:01
-?    ^</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4427,9 +4379,9 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>386</td>
-        <td>374</td>
-        <td>3</td>
+        <td>388</td>
+        <td>379</td>
+        <td>0</td>
         <td>1</td>
         <td>8</td>
         <td>&nbsp;</td>
@@ -4459,7 +4411,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-25-generic #26~20.04.1-Ubuntu SMP Fri Jan 7 16:27:40 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4561,7 +4513,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.29</td>
+              <td>1.4.31</td>
               <td>Basic</td>
             </tr>
           
@@ -4591,7 +4543,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4621,7 +4573,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4651,7 +4603,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4681,7 +4633,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>comicapi</th>
-              <td>2.2.0</td>
+              <td>2.2.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -4693,7 +4645,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4729,7 +4681,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.35.0</td>
+              <td>2.36.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4819,7 +4771,7 @@ AssertionError: &#39;0:02&#39; != &#39;0:01&#39;
 </div>
 
 <script>
-    drawCircle(374, 3, 1, 8);
+    drawCircle(379, 0, 1, 8);
     showCase(5);
 </script>
 

From d9c10b830a18629c1bb13524db67eaaff669af1b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 13:43:35 +0100
Subject: [PATCH 078/220] Added variable to allow loading cover from localhost

---
 cps/cli.py    |  3 +++
 cps/helper.py | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cps/cli.py b/cps/cli.py
index 3685e8e2..31ea8417 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -45,6 +45,7 @@ parser.add_argument('-v', '--version', action='version', help='Shows version num
 parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
 parser.add_argument('-s', metavar='user:pass', help='Sets specific username to new password')
 parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
+parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
 args = parser.parse_args()
 
 settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
@@ -77,6 +78,8 @@ if (args.k and not args.c) or (not args.k and args.c):
 if args.k == "":
     keyfilepath = ""
 
+# load covers from localhost
+allow_localhost = args.l or None
 # handle and check ip address argument
 ip_address = args.i or None
 if ip_address:
diff --git a/cps/helper.py b/cps/helper.py
index 622af817..2cfb119b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -46,7 +46,7 @@ try:
 except ImportError:
     use_unidecode = False
 
-from . import calibre_db
+from . import calibre_db, cli
 from .tasks.convert import TaskConvert
 from . import logger, config, get_locale, db, ub
 from . import gdriveutils as gd
@@ -584,11 +584,12 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
-        ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-        if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
-            log.error("Localhost was accessed for cover upload")
-            return False, _("You are not allowed to access localhost for cover uploads")
+        if not cli.allow_localhost:
+            # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
+            ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
+            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+                log.error("Localhost was accessed for cover upload")
+                return False, _("You are not allowed to access localhost for cover uploads")
         img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)

From 01ab75a158eff7b5bd2400226be8b87b875c5a54 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 23 Jan 2022 19:32:37 +0100
Subject: [PATCH 079/220] Updated requirements for gdrive and gmail Updated
 teststatus

---
 optional-requirements.txt               |   4 +-
 setup.cfg                               |   4 +-
 test/Calibre-Web TestSummary_Linux.html | 168 ++++++++++++------------
 3 files changed, 85 insertions(+), 91 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 92a01488..2ebcf1a7 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -14,7 +14,7 @@ six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
-google-api-python-client>=1.7.11,<2.36.0
+google-api-python-client>=1.7.11,<2.37.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index d372be87..db2fd3e6 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -59,7 +59,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -73,7 +73,7 @@ gdrive =
 	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
-	google-api-python-client>=1.7.11,<2.36.0
+	google-api-python-client>=1.7.11,<2.37.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 652248a2..8d8966ad 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-23 05:50:54</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-24 05:56:04</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>2022-01-23 10:25:22</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-24 09:54:16</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>3h 54 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 17 min</p>
         </div>
       </div>
       </div>
@@ -561,11 +561,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">6</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -593,11 +593,33 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id="ft7.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</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_ft7.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 332, in test_convert_only
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -714,15 +736,15 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">18</td>
-        <td class="text-center">15</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">1</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 18)">Detail</a>
+            <a onclick="showClassDetail('c10', 19)">Detail</a>
         </td>
     </tr>
 
@@ -730,7 +752,7 @@
     
         <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -739,7 +761,7 @@
     
         <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -748,7 +770,7 @@
     
         <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -757,7 +779,7 @@
     
         <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -766,7 +788,7 @@
     
         <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -775,7 +797,7 @@
     
         <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -784,7 +806,7 @@
     
         <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -793,7 +815,7 @@
     
         <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -801,6 +823,15 @@
     
     
         <tr id='pt10.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
@@ -809,38 +840,9 @@
     
     
     
-        <tr id="et10.10" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 59, in test_upload_cbz_coverformats
-    original_cover = self.check_element_on_page((By.ID, &#34;detailcover&#34;)).screenshot_as_png
-AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
         <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -849,7 +851,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
         <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -857,6 +859,15 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
         <tr id='pt10.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -865,19 +876,19 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id="st10.14" class="none bg-warning">
+        <tr id="st10.15" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.15')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st10.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_st10.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st10.15').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -891,7 +902,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='pt10.15' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
@@ -900,7 +911,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='st10.16' class='none bg-warning'>
+        <tr id='st10.17' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -909,7 +920,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt10.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -918,7 +929,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id='pt10.18' class='hiddenRow bg-success'>
+        <tr id='pt10.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -2180,13 +2191,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="passClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">12</td>
+        <td class="text-center">13</td>
+        <td class="text-center">0</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('c25', 13)">Detail</a>
         </td>
@@ -2203,28 +2214,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
     
     
     
-        <tr id="st25.2" class="none bg-warning">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.2')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st25.2" 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_st25.2').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Unknown how to test certificate</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4379,11 +4373,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>388</td>
-        <td>379</td>
-        <td>0</td>
+        <td>389</td>
+        <td>381</td>
         <td>1</td>
-        <td>8</td>
+        <td>0</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4771,7 +4765,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;screenshot_as_png&#3
 </div>
 
 <script>
-    drawCircle(379, 0, 1, 8);
+    drawCircle(381, 1, 0, 7);
     showCase(5);
 </script>
 

From e0e04220109920575179a8f924543449c6de0706 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 24 Jan 2022 19:18:40 +0100
Subject: [PATCH 080/220] Upates for new release

---
 SECURITY.md      | 3 +++
 cps/constants.py | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index c6f86607..3e5a965d 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -29,6 +29,9 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                           ||
 | V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo       ||
 | V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
+| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
+| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
+| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @ibarrionuevo         ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index 7fb973fc..281517cc 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.16 Beta'}
+STABLE_VERSION = {'version': '0.6.16'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 6a37c7ca9dd978487f43467258b81da86d08e7e6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 24 Jan 2022 19:27:09 +0100
Subject: [PATCH 081/220] Version bump

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

diff --git a/cps/constants.py b/cps/constants.py
index 281517cc..0a964fb7 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -151,7 +151,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.16'}
+STABLE_VERSION = {'version': '0.6.17 Beta'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 62e7aca0fb765545e4022172204ec377e6d80a4a Mon Sep 17 00:00:00 2001
From: Daniel <ge64tap@mytum.de>
Date: Tue, 25 Jan 2022 14:33:34 +0100
Subject: [PATCH 082/220] amazon metadata

---
 cps/metadata_provider/amazon.py | 98 +++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 cps/metadata_provider/amazon.py

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
new file mode 100644
index 00000000..f7738387
--- /dev/null
+++ b/cps/metadata_provider/amazon.py
@@ -0,0 +1,98 @@
+import concurrent.futures
+import requests
+from bs4 import BeautifulSoup as BS  # requirement
+import lxml     #requirement for better speed
+import cchardet #optional for better speed
+from cps.services.Metadata import Metadata
+#from time import time
+from operator import itemgetter
+class Amazon(Metadata):
+    __name__ = "Amazon"
+    __id__ = "amazon"
+    headers = {'upgrade-insecure-requests': '1',
+               'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36',
+               'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
+               'sec-gpc': '1',
+               'sec-fetch-site': 'none',
+               'sec-fetch-mode': 'navigate',
+               'sec-fetch-user': '?1',
+               'sec-fetch-dest': 'document',
+               'accept-encoding': 'gzip, deflate, br',
+               'accept-language': 'en-US,en;q=0.9'}
+    session = requests.Session()
+    session.headers=headers
+
+    def search(self, query: str, generic_cover=""):
+        #timer=time()
+        def inner(link,index)->[dict,int]:
+             with self.session as session:
+                r = session.get(f"https://www.amazon.com/{link}")
+                r.raise_for_status()
+                long_soup = BS(r.text, "lxml")  #~4sec :/
+                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
+                if soup2 is None:
+                    return
+                try:
+                    v = dict()
+                    v['source'] = {
+                        "id": self.__id__,
+                        "description": "Amazon Books",
+                        "link": "https://amazon.com/"
+                    }
+                    v['url'] = f"https://www.amazon.com/{link}"
+
+                    #the more searches the slower, these are too hard to find in reasonable time or might not even exist
+                    v['publisher'] = ""  # very unreliable
+                    v['publishedDate'] = ""  # very unreliable
+                    v['id'] = None  # ?
+                    v['tags'] = []  # dont exist on amazon
+
+
+                    try:
+                        v['description'] = "\n".join(
+                            soup2.find("div", attrs={"data-feature-name": "bookDescription"}).stripped_strings).replace(
+                            "\xa0"," ")[:-9].strip().strip("\n")
+                    except (AttributeError, TypeError):
+                        return None  # if there is no description it is not a book and therefore should be ignored
+                    try:
+                        v['title'] = soup2.find("span", attrs={"id": "productTitle"}).text
+                    except (AttributeError, TypeError):
+                        v['title'] = ""
+                    try:
+                        v['authors'] = [next(
+                            filter(lambda i: i != " " and i != "\n" and not i.startswith("{"),
+                                   x.findAll(text=True))).strip()
+                                        for x in soup2.findAll("span", attrs={"class": "author"})]
+                    except (AttributeError, TypeError, StopIteration):
+                        v['authors'] = ""
+                    try:
+                        v['rating'] = int(
+                            soup2.find("span", class_="a-icon-alt").text.split(" ")[0].split(".")[
+                                0])  # first number in string
+                    except (AttributeError, ValueError):
+                        v['rating'] = 0
+                    try:
+                        v['cover'] = soup2.find("img", attrs={"class": "a-dynamic-image frontImage"})["src"]
+                    except (AttributeError, TypeError):
+                        v['cover'] = ""
+                    return v,index
+                except:
+                    return
+
+        val = list()
+        if self.active:
+            results = self.session.get(
+                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}%2Cdigital-text&ref=nb_sb_noss",
+                headers=self.headers)
+            results.raise_for_status()
+            soup = BS(results.text, 'html.parser')
+            links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
+                          soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
+            with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
+                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
+        #print(val)
+        #print(f"time was {time()-timer}")
+        result=list(filter(lambda x: x, val))
+        return [x[0] for x in sorted(result,key=itemgetter(1))] #sort by amazons listing order for best relevance
+

From 8362c82d5491ecdb0843ca8346c3f59f90dd7c30 Mon Sep 17 00:00:00 2001
From: Daniel <ge64tap@mytum.de>
Date: Tue, 25 Jan 2022 14:33:34 +0100
Subject: [PATCH 083/220] amazon metadata

---
 cps/metadata_provider/amazon.py | 98 +++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 cps/metadata_provider/amazon.py

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
new file mode 100644
index 00000000..f7738387
--- /dev/null
+++ b/cps/metadata_provider/amazon.py
@@ -0,0 +1,98 @@
+import concurrent.futures
+import requests
+from bs4 import BeautifulSoup as BS  # requirement
+import lxml     #requirement for better speed
+import cchardet #optional for better speed
+from cps.services.Metadata import Metadata
+#from time import time
+from operator import itemgetter
+class Amazon(Metadata):
+    __name__ = "Amazon"
+    __id__ = "amazon"
+    headers = {'upgrade-insecure-requests': '1',
+               'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36',
+               'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
+               'sec-gpc': '1',
+               'sec-fetch-site': 'none',
+               'sec-fetch-mode': 'navigate',
+               'sec-fetch-user': '?1',
+               'sec-fetch-dest': 'document',
+               'accept-encoding': 'gzip, deflate, br',
+               'accept-language': 'en-US,en;q=0.9'}
+    session = requests.Session()
+    session.headers=headers
+
+    def search(self, query: str, generic_cover=""):
+        #timer=time()
+        def inner(link,index)->[dict,int]:
+             with self.session as session:
+                r = session.get(f"https://www.amazon.com/{link}")
+                r.raise_for_status()
+                long_soup = BS(r.text, "lxml")  #~4sec :/
+                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
+                if soup2 is None:
+                    return
+                try:
+                    v = dict()
+                    v['source'] = {
+                        "id": self.__id__,
+                        "description": "Amazon Books",
+                        "link": "https://amazon.com/"
+                    }
+                    v['url'] = f"https://www.amazon.com/{link}"
+
+                    #the more searches the slower, these are too hard to find in reasonable time or might not even exist
+                    v['publisher'] = ""  # very unreliable
+                    v['publishedDate'] = ""  # very unreliable
+                    v['id'] = None  # ?
+                    v['tags'] = []  # dont exist on amazon
+
+
+                    try:
+                        v['description'] = "\n".join(
+                            soup2.find("div", attrs={"data-feature-name": "bookDescription"}).stripped_strings).replace(
+                            "\xa0"," ")[:-9].strip().strip("\n")
+                    except (AttributeError, TypeError):
+                        return None  # if there is no description it is not a book and therefore should be ignored
+                    try:
+                        v['title'] = soup2.find("span", attrs={"id": "productTitle"}).text
+                    except (AttributeError, TypeError):
+                        v['title'] = ""
+                    try:
+                        v['authors'] = [next(
+                            filter(lambda i: i != " " and i != "\n" and not i.startswith("{"),
+                                   x.findAll(text=True))).strip()
+                                        for x in soup2.findAll("span", attrs={"class": "author"})]
+                    except (AttributeError, TypeError, StopIteration):
+                        v['authors'] = ""
+                    try:
+                        v['rating'] = int(
+                            soup2.find("span", class_="a-icon-alt").text.split(" ")[0].split(".")[
+                                0])  # first number in string
+                    except (AttributeError, ValueError):
+                        v['rating'] = 0
+                    try:
+                        v['cover'] = soup2.find("img", attrs={"class": "a-dynamic-image frontImage"})["src"]
+                    except (AttributeError, TypeError):
+                        v['cover'] = ""
+                    return v,index
+                except:
+                    return
+
+        val = list()
+        if self.active:
+            results = self.session.get(
+                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}%2Cdigital-text&ref=nb_sb_noss",
+                headers=self.headers)
+            results.raise_for_status()
+            soup = BS(results.text, 'html.parser')
+            links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
+                          soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
+            with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
+                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
+        #print(val)
+        #print(f"time was {time()-timer}")
+        result=list(filter(lambda x: x, val))
+        return [x[0] for x in sorted(result,key=itemgetter(1))] #sort by amazons listing order for best relevance
+

From 17b4643b7c55fedd9b3b6e81283980befa6360e5 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 25 Jan 2022 19:30:17 +0100
Subject: [PATCH 084/220] fix #2285 (Fix for shelf handling in caliblur theme)

---
 cps/static/js/caliBlur.js | 10 +++++-----
 cps/static/js/details.js  |  8 ++++----
 cps/templates/detail.html |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cps/static/js/caliBlur.js b/cps/static/js/caliBlur.js
index 3203c255..f99779bd 100644
--- a/cps/static/js/caliBlur.js
+++ b/cps/static/js/caliBlur.js
@@ -270,7 +270,7 @@ if ($("body.book").length > 0) {
 
             if (position + $("#add-to-shelves").width() > $(window).width()) {
                 positionOff = position + $("#add-to-shelves").width() - $(window).width();
-                adsPosition = position - positionOff - 5
+                adsPosition = position - positionOff - 5;
                 $("#add-to-shelves").attr("style", "left: " + adsPosition + "px !important; right: auto;  top: " + topPos + "px");
             } else {
                 $("#add-to-shelves").attr("style", "left: " + position + "px !important; right: auto;  top: " + topPos + "px");
@@ -429,7 +429,7 @@ if($("body.advsearch").length > 0) {
 
           if (position + $("#add-to-shelves").width() > $(window).width()) {
               positionOff = position + $("#add-to-shelves").width() - $(window).width();
-              adsPosition = position - positionOff - 5
+              adsPosition = position - positionOff - 5;
               $("#add-to-shelves").attr("style", "left: " + adsPosition + "px !important; right: auto;  top: " + topPos + "px");
           } else {
               $("#add-to-shelves").attr("style", "left: " + position + "px !important; right: auto;  top: " + topPos + "px");
@@ -479,12 +479,12 @@ if ($.trim($("#add-to-shelves").html()).length === 0) {
     $("#add-to-shelf").addClass("empty-ul");
 }
 
-shelfLength = $("#add-to-shelves li").length
-emptyLength = 0
+shelfLength = $("#add-to-shelves li").length;
+emptyLength = 0;
 
 $("#add-to-shelves").on("click", "li a", function () {
     console.log("#remove-from-shelves change registered");
-    emptyLength++
+    emptyLength++;
 
     setTimeout(function () {
         if (emptyLength >= shelfLength) {
diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index f559234e..6f99595d 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -59,10 +59,10 @@ $("#archived_cb").on("change", function() {
         )
     };
 
-    $("#shelf-actions").on("click", "[data-shelf-action]", function (e) {
+    $("#add-to-shelves, #remove-from-shelves").on("click", "[data-shelf-action]", function (e) {
         e.preventDefault();
         $.ajax({
-                url: this.href,
+                url: $(this).data('href'),
                 method:"post",
                 data: {csrf_token:$("input[name='csrf_token']").val()},
             })
@@ -72,7 +72,7 @@ $("#archived_cb").on("change", function() {
                     case "add":
                         $("#remove-from-shelves").append(
                             templates.remove({
-                                add: this.href,
+                                add: $this.data('href'),
                                 remove: $this.data("remove-href"),
                                 content: $("<div>").text(this.textContent).html()
                             })
@@ -82,7 +82,7 @@ $("#archived_cb").on("change", function() {
                         $("#add-to-shelves").append(
                             templates.add({
                                 add: $this.data("add-href"),
-                                remove: this.href,
+                                remove: $this.data('href'),
                                 content: $("<div>").text(this.textContent).html(),
                             })
                         );
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index c8d7d527..eb32f8fe 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -260,7 +260,7 @@
             {% for shelf in g.shelves_access %}
               {% 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) }}"
+                  <a data-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) }}"
                      data-shelf-action="add"
                   >
@@ -275,7 +275,7 @@
           {% if books_shelfs %}
             {% for shelf in g.shelves_access %}
               {% if shelf.id in books_shelfs %}
-                <a href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
+                <a data-href="{{ url_for('shelf.remove_from_shelf', book_id=entry.id, shelf_id=shelf.id) }}"
                    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"
                 >
@@ -309,13 +309,13 @@
 {% block js %}
 <script type="text/template" id="template-shelf-add">
   <li>
-    <a href="<%= add %>" data-remove-href="<%= remove %>" data-shelf-action="add">
+    <a data-href="<%= add %>" data-remove-href="<%= remove %>" data-shelf-action="add">
       <%= content %>
     </a>
   </li>
 </script>
 <script type="text/template" id="template-shelf-remove">
-  <a href="<%= remove %>" data-add-href="<%= add %>" class="btn btn-sm btn-default" data-shelf-action="remove">
+  <a data-href="<%= remove %>" data-add-href="<%= add %>" class="btn btn-sm btn-default" data-shelf-action="remove">
     <span class="glyphicon glyphicon-remove"></span> <%= content %>
   </a>
 </script>

From 3c4cd22d9eed5b7444c1c209cdb6923427e58b70 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 25 Jan 2022 21:13:17 +0100
Subject: [PATCH 085/220] Renaming files on gdrive seem to work

---
 cps/gdriveutils.py | 17 ++++++---
 cps/helper.py      | 95 +++-------------------------------------------
 2 files changed, 18 insertions(+), 94 deletions(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 38cbd74f..de3fbb64 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -385,15 +385,22 @@ def moveGdriveFolderRemote(origin_file, target_folder):
     previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
     children = drive.auth.service.children().list(folderId=previous_parents).execute()
     gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
-    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
+    if not gFileTargetDir:
+        gFileTargetDir = drive.CreateFile(
+            {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
+             "mimeType": "application/vnd.google-apps.folder"})
+        gFileTargetDir.Upload()
+        # Move the file to the new folder
+        drive.auth.service.files().update(fileId=origin_file['id'],
+                                          addParents=gFileTargetDir['id'],
+                                          removeParents=previous_parents,
+                                          fields='id, parents').execute()
+
+    elif gFileTargetDir['title'] != target_folder:
         # Folder is not existing, create, and move folder
         drive.auth.service.files().patch(fileId=origin_file['id'],
                                          body={'title': target_folder},
                                          fields='title').execute()
-        #gFileTargetDir = drive.CreateFile(
-        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
-        #     "mimeType": "application/vnd.google-apps.folder"})
-        #gFileTargetDir.Upload()
     else:
         # Move the file to the new folder
         drive.auth.service.files().update(fileId=origin_file['id'],
diff --git a/cps/helper.py b/cps/helper.py
index 6cf7a464..af90089b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -360,51 +360,13 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
                                                            file_format.name + '.' + file_format.format.lower())
                         if gFile:
                             gd.moveGdriveFileRemote(gFile, all_new_name + u'.' + file_format.format.lower())
+                            gd.updateDatabaseOnEdit(gFile['id'], all_new_name + u'.' + file_format.format.lower())
                         else:
                             log.error("File {} not found on gdrive"
                                       .format(all_new_path, file_format.name + '.' + file_format.format.lower()))
                     file_format.name = all_new_name
 
 
-def clean_author_database_gdrive(renamed_author, calibrepath, local_book=None):
-    valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
-    for r in renamed_author:
-        if local_book:
-            all_books = [local_book]
-        else:
-            all_books = calibre_db.session.query(db.Books) \
-                .filter(db.Books.authors.any(db.Authors.name == r)).all()
-        for book in all_books:
-            book_author_path = book.path.split('/')[0]
-            if book_author_path in valid_filename_authors or local_book:
-                new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-                all_new_authordir = get_valid_filename(new_author.name)
-                all_titledir = book.path.split('/')[1]
-                all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
-                all_new_name = get_valid_filename(book.title) + ' - ' + all_new_authordir
-                # change location in database to new author/title path
-                book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
-                for file_format in book.data:
-                    shutil.move(os.path.normcase(
-                        os.path.join(all_new_path, file_format.name + '.' + file_format.format.lower())),
-                        os.path.normcase(os.path.join(all_new_path, all_new_name + '.' + file_format.format.lower())))
-                    file_format.name = all_new_name
-
-
-# was muss gemacht werden:
-# Die Autorennamen müssen separiert werden und von dupletten bereinigt werden.
-# Es muss geprüft werden:
-# - ob es die alten Autoren mit dem letzten Buch verknüpft waren, dann müssen sie gelöscht werden
-# - ob es neue Autoren sind, dann müssen sie angelegt werden -> macht modify_database_object
-# - ob es bestehende Autoren sind welche umbenannt wurden -> Groß Kleinschreibung, dann muss:
-# für jedes Buch und jeder Autor welcher umbenannt wurde:
-#   - Autorensortierung angepasst werden
-#   - Pfad im Buch angepasst werden
-#   - Dateiname in Datatabelle angepasst werden, sowie die Dateien umbenannt werden
-#   - Dateipfade Autor umbenannt werden
-# die letzten Punkte treffen auch zu wenn es sich um einen normalen Autoränderungsvorgang handelt kann man also generell
-# behandeln
-
 # Moves files in file storage during author/title rename, or from temp dir to file storage
 def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
@@ -486,7 +448,6 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     error = False
     book = calibre_db.get_book(book_id)
-    path = book.path
 
     authordir = book.path.split('/')[0]
     if first_author:
@@ -507,76 +468,32 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     titledir = book.path.split('/')[1]
     new_titledir = get_valid_filename(book.title) + u" (" + str(book_id) + u")"
 
-    '''if titledir != new_titledir:
+    if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
         if gFile:
             gFile['title'] = new_titledir
             gFile.Upload()
             book.path = book.path.split('/')[0] + u'/' + new_titledir
-            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
 
-    if authordir != new_authordir:
+    if authordir != new_authordir and authordir not in renamed_author:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
         if gFile:
             gd.moveGdriveFolderRemote(gFile, new_authordir)
             book.path = new_authordir + u'/' + book.path.split('/')[1]
-            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
 
-    if authordir != new_authordir or titledir != new_titledir:
-        new_path = os.path.join(new_authordir, new_titledir)
-        new_name = get_valid_filename(book.title) + ' - ' + get_valid_filename(new_authordir)
-        gFile = gd.getFileFromEbooksFolder(new_authordir, new_titledir)
-        if not gFile:
-            # move original path to new path
-            log.debug("Moving title: %s to %s", path, new_path)
-            gFile = gd.getFileFromEbooksFolder(authordir, titledir)
-            # move author and title  -> currently only title??
-            gd.moveGdriveFileRemote(gFile, new_titledir)
-            # shutil.move(os.path.normcase(path), os.path.normcase(new_path))
-        else:  # path is valid copy only files to new location (merge)
-            log.info("Moving title: %s into existing: %s", path, new_path)
-            # Take all files and subfolder from old path (strange command)
-            # gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
-            for dir_name, __, file_list in os.walk(path):
-                for file in file_list:
-                    shutil.move(os.path.normcase(os.path.join(dir_name, file)),
-                                os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
     # change location in database to new author/title path
     book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
 
-    #for file_format in book.data:
-    #        gFile = gd.getFileFromEbooksFolder(path, file_format.name + '.' + file_format.format.lower())
-    #        if not gFile:
-    #           error = _(u'File %(file)s not found on Google Drive', file=file_format.name)  # file not found
-    #            break
-    #        gd.moveGdriveFileRemote(gFile, new_name + u'.' + file_format.format.lower())
-    #        file_format.name = new_name
-
-    # Todo: Rename all authors on gdrive
     # Rename all files from old names to new names
-    clean_author_database(renamed_author, "")
+    clean_author_database(renamed_author, "", gdrive=True)
     if first_author not in renamed_author:
-        clean_author_database([first_author], "", book)
-    #if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-    #        shutil.rmtree(os.path.dirname(path))
-
-    '''# Rename all files from old names to new names
-    try:
-        clean_author_database(renamed_author, calibrepath)
-        if first_author not in renamed_author:
-            clean_author_database([first_author], calibrepath, localbook)
-        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-            shutil.rmtree(os.path.dirname(path))
-    except (OSError, FileNotFoundError) as ex:
-        log.error("Error in rename file in path %s", ex)
-        log.debug(ex, exc_info=True)
-        return _("Error in rename file in path: %(error)s", error=str(ex))'''
+        clean_author_database([first_author], "", book, gdrive=True)
 
     return error
 

From baf32f9045c7dd23c166e270e35fdac8c92d5562 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 26 Jan 2022 07:31:01 +0100
Subject: [PATCH 086/220] Update Teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 4028 +++++++----------------
 1 file changed, 1124 insertions(+), 2904 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index b5b6f04c..d3587088 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2021-12-04 22:17:44</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-25 21:16:05</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>2021-12-05 01:46:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-26 01:13:49</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>2h 48 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 17 min</p>
         </div>
       </div>
       </div>
@@ -411,15 +411,15 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEbookConvertCalibre</td>
-        <td class="text-center">14</td>
-        <td class="text-center">12</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
+        <td class="text-center">15</td>
+        <td class="text-center">7</td>
+        <td class="text-center">7</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 14)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
@@ -427,7 +427,7 @@
     
         <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
+                <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -436,23 +436,74 @@
     
         <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id="et6.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et6.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et6.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 201, in test_convert_email
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft6.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</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_ft6.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 245, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Finished&#39; != &#39;Failed&#39;
+- Finished
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -461,7 +512,7 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -470,27 +521,40 @@
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id="ft6.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt6.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id="ft6.8" class="none bg-danger">
             <td>
-                <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -505,7 +569,7 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 506, in test_convert_xss
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 110, in test_convert_wrong_excecutable
     self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
 AssertionError: False is not true</pre>
                     </div>
@@ -517,25 +581,98 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id="ft6.9" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 519, in test_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft6.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</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_ft6.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 441, in test_email_failed
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id="ft6.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</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_ft6.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 412, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id='pt6.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -544,7 +681,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.12' class='hiddenRow bg-success'>
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -553,7 +690,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -562,26 +699,28 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft6.14" class="none bg-danger">
+        <tr id="ft6.15" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.14')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.15')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft6.14" class="popup_window test_output" style="display:block;">
+                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.14').style.display='none'"><span
+                                onclick="document.getElementById('div_ft6.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 538, in test_user_convert_xss
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 553, in test_user_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -592,11 +731,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">6</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -606,20 +745,62 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id="ft7.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</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_ft7.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 194, in test_convert_email
+    self.assertTrue(&#34;Convert&#34; in ret[-2][&#39;task&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id="ft7.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</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_ft7.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 234, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Finished&#39; != &#39;Failed&#39;
+- Finished
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -633,29 +814,93 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id="ft7.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</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_ft7.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 158, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id="ft7.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</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_ft7.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 421, in test_email_failed
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id="ft7.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</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_ft7.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 389, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -747,48 +992,37 @@ AssertionError: False is not true</pre>
 
     <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">16</td>
-        <td class="text-center">6</td>
-        <td class="text-center">2</td>
-        <td class="text-center">6</td>
+        <td class="text-center">19</td>
+        <td class="text-center">13</td>
+        <td class="text-center">0</td>
+        <td class="text-center">4</td>
         <td class="text-center">2</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 16)">Detail</a>
+            <a onclick="showClassDetail('c10', 19)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft10.1" class="none bg-danger">
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 136, in test_change_upload_formats
-    self.assertTrue(self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id='pt10.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
@@ -797,38 +1031,9 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft10.3" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 642, in test_delete_role
-    self.assertTrue(self.delete_book_format(12, &#39;FB2&#39;))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
         <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -837,7 +1042,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -846,7 +1051,7 @@ AssertionError: False is not true</pre>
     
         <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -854,6 +1059,24 @@ AssertionError: False is not true</pre>
     
     
         <tr id='pt10.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -862,159 +1085,52 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="et10.8" class="none bg-info">
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 654, in test_title_sort
-    self.verify_order(&#34;search&#34;, order=order)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1324, in verify_order
-    self.check_element_on_page((By.ID, key)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.9" class="none bg-info">
+        <tr id='pt10.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="et10.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.9')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.12')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et10.9" class="popup_window test_output" style="display:block;">
+                <div id="div_et10.12" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.9').style.display='none'"><span
+                                onclick="document.getElementById('div_et10.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 510, in test_upload_edit_role
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 664, in test_upload_edit_role
+    self.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 87, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
     raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et10.10" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 55, in test_upload_metadata_cbr
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et10.11" class="none bg-info">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 92, in test_upload_metadata_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st10.12" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.12')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st10.12" 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.12').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Not implemented</pre>
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1026,7 +1142,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
         <tr id="et10.13" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -1041,15 +1157,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 240, in test_writeonly_path
-    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path()})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 148, in test_upload_metadata_cbr
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
     cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
     WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
     raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1059,27 +1179,74 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='st10.14' class='none bg-warning'>
+        <tr id="et10.14" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 185, in test_upload_metadata_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>SKIP</td>
         </tr>
     
     
     
-        <tr id='pt10.15' class='hiddenRow bg-success'>
+        <tr id="st10.15" class="none bg-warning">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.15')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st10.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_st10.15').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="et10.16" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -1094,9 +1261,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 718, in test_xss_custom_comment_edit
-    self.assertEqual(0, len(values[&#39;cust_columns&#39;]))
-KeyError: &#39;cust_columns&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 344, in test_writeonly_path
+    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path(), &#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1105,6 +1282,33 @@ KeyError: &#39;cust_columns&#39;</pre>
         </tr>
     
     
+    
+        <tr id='st10.17' class='none bg-warning'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt10.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="errorClass">
@@ -1138,19 +1342,21 @@ KeyError: &#39;cust_columns&#39;</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 41, in tearDownClass
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 44, in tearDownClass
     cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 444, in stop_calibre_web
-    cls.driver.find_element_by_id(&#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
     return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
     self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
     raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]</pre>
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1161,15 +1367,15 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
+        <td class="text-center">36</td>
         <td class="text-center">35</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
-        <td class="text-center">19</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('c12', 35)">Detail</a>
+            <a onclick="showClassDetail('c12', 36)">Detail</a>
         </td>
     </tr>
 
@@ -1202,292 +1408,92 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id="ft12.4" class="none bg-danger">
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft12.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft12.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 443, in test_edit_comments
-    self.assertEqual(len(self.adv_search({u&#39;comment&#39;: u&#39;mirä 人&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.5" class="none bg-info">
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 452, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.6" class="none bg-info">
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 543, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.7" class="none bg-info">
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 526, in test_edit_custom_comment
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_5&#39;: u&#39;人1 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.8" class="none bg-info">
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 592, in test_edit_custom_date
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_2_start&#39;: u&#39;16/7/2015&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.9" class="none bg-info">
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 560, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.10" class="none bg-info">
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 576, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.11" class="none bg-info">
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 467, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.12" class="none bg-info">
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 493, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.13" class="none bg-info">
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 509, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1537,31 +1543,11 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id="et12.19" class="none bg-info">
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.19').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 73, in test_edit_title
-    self.assertEqual(u&#39;O0ü 执&#39;, values[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1646,311 +1632,92 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id="et12.27" class="none bg-info">
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.27')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.27" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.27').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 1022, in test_upload_book_cbr
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.28" class="none bg-info">
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.28')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.28" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.28').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 987, in test_upload_book_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.29" class="none bg-info">
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.29')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.29" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.29').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 961, in test_upload_book_cbz
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.30" class="none bg-info">
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.30')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.30" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.30').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 922, in test_upload_book_epub
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.31" class="none bg-info">
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.31')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.31" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.31').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 844, in test_upload_book_fb2
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.32" class="none bg-info">
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.32')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.32" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.32').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 870, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.33" class="none bg-info">
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.33')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.33" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.33').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 896, in test_upload_book_mobi
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.34" class="none bg-info">
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.34')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.34" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.34').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 818, in test_upload_book_pdf
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et12.35" class="none bg-info">
+        <tr id='pt12.35' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et12.35')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et12.35" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et12.35').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 769, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2115,8 +1882,8 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 73, in test_bookslist_edit_title
     bl = self.get_books_list(-1)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1827, in get_books_list
-    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements_by_xpath(&#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1830, in get_books_list
+    element_text = &#34;+&#34; if &#34;glyphicon-plus&#34; in click_element.find_elements(By.XPATH, &#34;./span&#34;)[0].get_attribute(&#39;class&#39;) else &#34;&#34;
 IndexError: list index out of range</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -2144,7 +1911,7 @@ IndexError: list index out of range</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 287, in test_list_visibility
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 291, in test_list_visibility
     self.assertEqual(17, len(bl[&#39;column_elements&#39;]))
 AssertionError: 17 != 20</pre>
                     </div>
@@ -2173,7 +1940,7 @@ AssertionError: 17 != 20</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 326, in test_restricted_rights
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 330, in test_restricted_rights
     self.assertFalse(&#39;Delete&#39; in bl[&#39;table&#39;][0])
 AssertionError: True is not false</pre>
                     </div>
@@ -2215,21 +1982,65 @@ AssertionError: 9 != 10</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
-        <td class="text-center">9</td>
-        <td class="text-center">2</td>
-        <td class="text-center">9</td>
+    <tr id="su" class="failClass">
+        <td>TestLoadMetadata</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <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('c14', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id="ft14.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft14.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditBooksOnGdrive</td>
+        <td class="text-center">20</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('c15', 20)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -2238,7 +2049,7 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -2247,7 +2058,7 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -2256,7 +2067,7 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -2265,210 +2076,70 @@ AssertionError: 9 != 10</pre>
     
     
     
-        <tr id="ft14.5" class="none bg-danger">
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 652, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.6" class="none bg-info">
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 714, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.7" class="none bg-info">
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 732, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.8" class="none bg-info">
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 748, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.9" class="none bg-info">
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 661, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.10" class="none bg-info">
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 681, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.11" class="none bg-info">
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 697, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2477,7 +2148,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2486,7 +2157,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2495,7 +2166,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2504,7 +2175,7 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2513,130 +2184,62 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
     
     
     
-        <tr id="et14.17" class="none bg-info">
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 850, in test_upload_book_epub
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.18" class="none bg-info">
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 815, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et14.19" class="none bg-info">
+        <tr id='pt15.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et14.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et14.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et14.19').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 763, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft14.20" class="none bg-danger">
+        <tr id='pt15.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 901, in test_watch_metadata
-    self.assertTrue(button)
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestLoadMetadataScholar</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c16', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt16.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2650,13 +2253,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 3)">Detail</a>
+            <a onclick="showClassDetail('c17', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -2665,7 +2268,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -2674,7 +2277,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2684,21 +2287,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">5</td>
+        <td class="text-center">7</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('c16', 7)">Detail</a>
+            <a onclick="showClassDetail('c18', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2707,7 +2310,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2716,7 +2319,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2725,7 +2328,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2734,7 +2337,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2743,60 +2346,20 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="et16.6" class="none bg-info">
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 147, in test_email_limit
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.7" class="none bg-info">
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 217, in test_filepicker_two_file
-    accordions[0].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2809,54 +2372,6 @@ IndexError: list index out of range</pre>
         <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('c17', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt17.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestErrorReadColumn</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt18.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestFilePicker</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c19', 1)">Detail</a>
         </td>
@@ -2865,6 +2380,63 @@ IndexError: list index out of range</pre>
     
     
         <tr id='pt19.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestErrorReadColumn</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">
+            <a onclick="showClassDetail('c20', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt20.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt20.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="skipClass">
+        <td>TestFilePicker</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</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('c21', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2872,6 +2444,41 @@ IndexError: list index out of range</pre>
         </tr>
     
     
+    
+        <tr id="st21.2" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st21.2')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st21.2" 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_st21.2').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>
+        </tr>
+    
+    
+    
+        <tr id='pt21.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_two_filepickers</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -2882,13 +2489,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c22', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2906,13 +2513,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2921,7 +2528,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2930,7 +2537,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2940,54 +2547,30 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">2</td>
-        <td class="text-center">9</td>
+        <td class="text-center">11</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('c22', 11)">Detail</a>
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft22.1" class="none bg-danger">
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 584, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2996,139 +2579,43 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft22.3" class="none bg-danger">
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 603, in test_kobo_sync_selected_shelfs
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.4" class="none bg-danger">
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 653, in test_kobo_upload_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.5" class="none bg-danger">
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 448, in test_shelves_add_remove_books
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.6" class="none bg-danger">
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 278, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt22.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -3137,154 +2624,58 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft22.8" class="none bg-danger">
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 515, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.9" class="none bg-danger">
+        <tr id='pt24.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 297, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.10" class="none bg-danger">
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 243, in test_sync_unchanged
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft22.11" class="none bg-danger">
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft22.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft22.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft22.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 257, in test_sync_upload
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 111, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</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('c23', 5)">Detail</a>
+            <a onclick="showClassDetail('c25', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -3293,134 +2684,38 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft23.2" class="none bg-danger">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 260, in test_kobo_sync_selected_shelfs
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft23.3" class="none bg-danger">
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 164, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft23.4" class="none bg-danger">
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 237, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft23.5" class="none bg-danger">
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 193, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 103, in inital_sync
-    self.assertEqual(r.json(), {})
-AssertionError: {&#39;Benefits&#39;: {}} != {}
-- {&#39;Benefits&#39;: {}}
-+ {}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3434,13 +2729,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 13)">Detail</a>
+            <a onclick="showClassDetail('c26', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -3449,7 +2744,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -3458,7 +2753,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -3467,7 +2762,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -3476,7 +2771,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -3485,7 +2780,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -3494,7 +2789,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3503,7 +2798,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3512,7 +2807,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3521,7 +2816,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3530,7 +2825,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -3539,7 +2834,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.12' class='hiddenRow bg-success'>
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -3548,7 +2843,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt24.13' class='hiddenRow bg-success'>
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -3566,13 +2861,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 8)">Detail</a>
+            <a onclick="showClassDetail('c27', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3581,7 +2876,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3590,7 +2885,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -3599,7 +2894,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -3608,7 +2903,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -3617,7 +2912,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -3626,7 +2921,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -3635,7 +2930,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -3653,13 +2948,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 9)">Detail</a>
+            <a onclick="showClassDetail('c28', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -3668,7 +2963,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3677,7 +2972,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3686,7 +2981,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3695,19 +2990,19 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="st26.5" class="none bg-warning">
+        <tr id="st28.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st28.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_st26.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st28.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3721,7 +3016,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3730,7 +3025,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3739,7 +3034,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3748,7 +3043,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3766,13 +3061,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 15)">Detail</a>
+            <a onclick="showClassDetail('c29', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3781,7 +3076,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3790,7 +3085,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3799,7 +3094,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3808,7 +3103,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3817,7 +3112,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3826,7 +3121,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3835,7 +3130,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3844,7 +3139,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3853,7 +3148,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3862,7 +3157,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3871,7 +3166,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3880,7 +3175,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3889,7 +3184,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3898,7 +3193,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt27.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3916,24 +3211,24 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
+                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestMergeBooksList - test_merge_book</div>
+                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -3949,13 +3244,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3964,7 +3259,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3982,13 +3277,13 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 23)">Detail</a>
+            <a onclick="showClassDetail('c32', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3997,7 +3292,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -4006,7 +3301,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -4015,7 +3310,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -4024,7 +3319,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -4033,7 +3328,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt32.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -4042,7 +3337,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt32.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -4051,7 +3346,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt32.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -4060,7 +3355,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt32.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -4069,7 +3364,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt32.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -4078,7 +3373,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt32.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -4087,7 +3382,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt32.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -4096,7 +3391,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt32.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -4105,7 +3400,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt32.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -4114,7 +3409,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt32.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -4123,7 +3418,7 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id='pt30.16' class='hiddenRow bg-success'>
+        <tr id='pt32.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -4132,19 +3427,19 @@ AssertionError: {&#39;Benefits&#39;: {}} != {}
     
     
     
-        <tr id="ft30.17" class="none bg-danger">
+        <tr id="ft32.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft30.17')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft32.17')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft30.17" class="popup_window test_output" style="display:block;">
+                <div id="div_ft32.17" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft30.17').style.display='none'"><span
+                                onclick="document.getElementById('div_ft32.17').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4161,7 +3456,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.18' class='hiddenRow bg-success'>
+        <tr id='pt32.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -4170,7 +3465,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.19' class='hiddenRow bg-success'>
+        <tr id='pt32.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -4179,7 +3474,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.20' class='hiddenRow bg-success'>
+        <tr id='pt32.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -4188,7 +3483,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.21' class='hiddenRow bg-success'>
+        <tr id='pt32.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -4197,7 +3492,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.22' class='hiddenRow bg-success'>
+        <tr id='pt32.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -4206,7 +3501,7 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id='pt30.23' class='hiddenRow bg-success'>
+        <tr id='pt32.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -4216,67 +3511,45 @@ AssertionError: 200 != 500</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUploadPDF</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c31', 1)">Detail</a>
+            <a onclick="showClassDetail('c33', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et31.1" class="none bg-info">
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et31.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 129, in test_upload_invalid_pdf
-    self.check_uploaded_pdf({&#39;author&#39;: &#34;Mani Mücks&#34;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pdf_metadata.py&#34;, line 59, in check_uploaded_pdf
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 5)">Detail</a>
+            <a onclick="showClassDetail('c34', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -4285,7 +3558,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -4294,7 +3567,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -4303,38 +3576,16 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id="et32.4" class="none bg-info">
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et32.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et32.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et32.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 191, in sound_test
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -4352,13 +3603,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 8)">Detail</a>
+            <a onclick="showClassDetail('c35', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -4367,7 +3618,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -4376,7 +3627,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -4385,7 +3636,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -4394,7 +3645,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -4403,7 +3654,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt35.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -4412,7 +3663,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt35.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -4421,7 +3672,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt35.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -4439,13 +3690,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 3)">Detail</a>
+            <a onclick="showClassDetail('c36', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -4454,7 +3705,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -4463,7 +3714,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -4473,21 +3724,21 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestShelf</td>
-        <td class="text-center">26</td>
-        <td class="text-center">1</td>
-        <td class="text-center">10</td>
+        <td class="text-center">15</td>
         <td class="text-center">14</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('c35', 26)">Detail</a>
+            <a onclick="showClassDetail('c37', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -4496,657 +3747,118 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id="ft35.2" class="none bg-danger">
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 466, in test_adv_search_shelf
-    self.assertEqual(len(self.adv_search({u&#39;include_shelf&#39;: u&#39;Search&#39;, &#39;book_title&#39;: &#39;book&#39;})), 2)
-AssertionError: 0 != 2</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.3" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_adv_search_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.4" class="none bg-danger">
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 252, in test_arrange_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.5" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_arrange_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et35.6" class="none bg-info">
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 146, in test_create_public_shelf
-    self.create_user(&#39;invalid&#39;, {&#39;edit_shelf_role&#39;: 0, &#39;password&#39;: &#39;1234&#39;, &#39;email&#39;: &#39;bac@b.com&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 976, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
-    ele = cls.driver.find_element_by_id(checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;edit_shelf_role&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.7" class="none bg-info">
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestShelf - test_create_public_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft35.8" class="none bg-danger">
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 237, in test_delete_book_of_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.9" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.10" class="none bg-danger">
+        <tr id='pt37.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 57, in test_private_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.11" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_private_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.12" class="none bg-danger">
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.12')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 295, in test_public_private_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.13" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_public_private_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.14" class="none bg-danger">
+        <tr id='pt37.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.14')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 95, in test_public_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.15" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_public_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.16" class="none bg-danger">
+        <tr id='pt37.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 168, in test_rename_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.17" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_rename_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.18" class="none bg-danger">
+        <tr id='pt37.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 334, in test_shelf_action_non_shelf_edit_role
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.19" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.19').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et35.20" class="none bg-info">
+        <tr id='pt37.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 391, in test_shelf_anonymous
-    self.fill_basic_config({&#39;config_anonbrowse&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 356, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 266, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et35.21" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_anonymous</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.21')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.21" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.21').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="st35.22" class="none bg-warning">
+        <tr id="st37.13" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st35.22')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.13')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st35.22" class="popup_window test_output" style="display:none;">
+                <div id="div_st37.13" 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_st35.22').style.display='none'"><span
+                                onclick="document.getElementById('div_st37.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -5160,126 +3872,20 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="ft35.23" class="none bg-danger">
+        <tr id='pt37.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.23')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.23" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.23').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 328, in test_shelf_long_name
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et35.24" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_shelf_long_name</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.24')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.24" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.24').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.25" class="none bg-danger">
+        <tr id='pt37.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.25')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft35.25" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.25').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 479, in test_xss_shelf
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et35.26" class="none bg-info">
-            <td>
-                <div class='testcase'>TestShelf - test_xss_shelf</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.26')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et35.26" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.26').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 44, in tearDown
-    self.login(&#39;admin&#39;,&#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 84, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 80, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message:</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5293,13 +3899,13 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 9)">Detail</a>
+            <a onclick="showClassDetail('c38', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -5308,7 +3914,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -5317,7 +3923,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -5326,7 +3932,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -5335,7 +3941,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -5344,7 +3950,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -5353,19 +3959,19 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id="st36.7" class="none bg-warning">
+        <tr id="st38.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st38.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_st36.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st38.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -5379,7 +3985,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -5388,7 +3994,7 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -5398,84 +4004,34 @@ selenium.common.exceptions.TimeoutException: Message:</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">2</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">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 2)">Detail</a>
+            <a onclick="showClassDetail('c39', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et37.1" class="none bg-info">
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 82, in test_upload_epub_duplicate
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et37.2" class="none bg-info">
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 110, in test_upload_epub_lang
-    self.change_visibility_me({&#39;locale&#39;: &#34;Italiano&#34;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 887, in change_visibility_me
-    select = Select(cls.driver.find_element_by_id(key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in find_element_by_id
-    return self.find_element(by=By.ID, value=id_)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 976, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;locale&#34;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5489,13 +4045,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('c38', 18)">Detail</a>
+            <a onclick="showClassDetail('c40', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -5504,7 +4060,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -5513,7 +4069,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -5522,7 +4078,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -5531,7 +4087,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -5540,7 +4096,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -5549,7 +4105,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -5558,7 +4114,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -5567,7 +4123,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -5576,7 +4132,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -5585,7 +4141,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -5594,7 +4150,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -5603,7 +4159,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -5612,7 +4168,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.14' class='hiddenRow bg-success'>
+        <tr id='pt40.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -5621,7 +4177,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -5630,7 +4186,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -5639,7 +4195,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.17' class='hiddenRow bg-success'>
+        <tr id='pt40.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -5648,7 +4204,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt38.18' class='hiddenRow bg-success'>
+        <tr id='pt40.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -5666,13 +4222,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('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c41', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -5690,13 +4246,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('c40', 21)">Detail</a>
+            <a onclick="showClassDetail('c42', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -5705,7 +4261,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -5714,7 +4270,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -5723,7 +4279,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -5732,7 +4288,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -5741,7 +4297,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -5750,7 +4306,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -5759,7 +4315,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -5768,7 +4324,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -5777,7 +4333,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -5786,7 +4342,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -5795,7 +4351,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -5804,7 +4360,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -5813,7 +4369,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -5822,7 +4378,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -5831,7 +4387,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -5840,7 +4396,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -5849,7 +4405,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -5858,7 +4414,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.19' class='hiddenRow bg-success'>
+        <tr id='pt42.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -5867,7 +4423,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.20' class='hiddenRow bg-success'>
+        <tr id='pt42.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -5876,7 +4432,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt40.21' class='hiddenRow bg-success'>
+        <tr id='pt42.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -5886,21 +4442,21 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">34</td>
-        <td class="text-center">20</td>
-        <td class="text-center">4</td>
-        <td class="text-center">10</td>
+        <td class="text-center">34</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('c41', 34)">Detail</a>
+            <a onclick="showClassDetail('c43', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -5909,7 +4465,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -5918,7 +4474,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -5927,7 +4483,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -5936,7 +4492,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -5945,7 +4501,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -5954,7 +4510,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -5963,7 +4519,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -5972,7 +4528,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -5981,7 +4537,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -5990,7 +4546,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -5999,7 +4555,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -6008,7 +4564,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -6017,7 +4573,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -6026,7 +4582,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -6035,7 +4591,7 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -6044,123 +4600,43 @@ selenium.common.exceptions.NoSuchElementException: Message: Unable to locate ele
     
     
     
-        <tr id="ft41.17" class="none bg-danger">
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 755, in test_allow_columns
-    self.assertEqual(len(self.adv_search({&#39;book_title&#39;: &#39;Buchtitel&#39;})), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.18" class="none bg-danger">
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 586, in test_allow_tags
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="ft41.19" class="none bg-danger">
+        <tr id='pt43.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.19')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.19').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 943, in test_archive_books
-    self.assertIsNotNone(details[&#39;archived&#39;])
-AssertionError: unexpectedly None</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.20" class="none bg-info">
+        <tr id='pt43.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 911, in test_authors_max_settings
-    self.assertEqual(len(list_element[1][10][&#39;author&#39;]), 4)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt43.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -6169,7 +4645,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt41.22' class='hiddenRow bg-success'>
+        <tr id='pt43.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -6178,94 +4654,34 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="et41.23" class="none bg-info">
+        <tr id='pt43.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.23')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.23" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.23').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 852, in test_hide_custom_column
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.24" class="none bg-info">
+        <tr id='pt43.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.24')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.24" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.24').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 786, in test_link_column_to_read_status
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.25" class="none bg-info">
+        <tr id='pt43.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.25')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.25" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.25').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 89, in test_random_books_available
-    list_element[0].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.26' class='hiddenRow bg-success'>
+        <tr id='pt43.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -6274,94 +4690,34 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="ft41.27" class="none bg-danger">
+        <tr id='pt43.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.27')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.27" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.27').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 669, in test_restrict_columns
-    self.assertEqual(len(restricts), 0)
-AssertionError: 1 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.28" class="none bg-info">
+        <tr id='pt43.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.28')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.28" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.28').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 514, in test_restrict_tags
-    self.assertEqual(len(elements[&#39;include_tags&#39;]), 1)
-TypeError: &#39;bool&#39; object is not subscriptable</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.29" class="none bg-info">
+        <tr id='pt43.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.29')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.29" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.29').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 991, in test_save_views_recent
-    self.check_element_on_page((By.ID, &#34;desc&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.30' class='hiddenRow bg-success'>
+        <tr id='pt43.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -6370,156 +4726,38 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id="et41.31" class="none bg-info">
+        <tr id='pt43.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.31')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.31" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.31').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 474, in test_search_order
-    self.search(&#39;book&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1991, in search
-    field.send_keys(term)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 477, in send_keys
-    self._execute(Command.SEND_KEYS_TO_ELEMENT,
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;query&#34; class=&#34;form-control&#34; name=&#34;query&#34; type=&#34;text&#34;&gt; is not reachable by keyboard</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.32" class="none bg-info">
+        <tr id='pt43.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.32')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.32" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.32').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 469, in test_search_string
-    self.search(&#39;Hallo&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1991, in search
-    field.send_keys(term)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 477, in send_keys
-    self._execute(Command.SEND_KEYS_TO_ELEMENT,
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;input id=&#34;query&#34; class=&#34;form-control&#34; name=&#34;query&#34; type=&#34;text&#34;&gt; is not reachable by keyboard</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.33" class="none bg-info">
+        <tr id='pt43.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.33')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.33" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.33').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 101, in test_user_email_available
-    self.driver.find_element_by_id(&#34;top_user&#34;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;a id=&#34;top_user&#34; href=&#34;/me&#34;&gt; is not clickable at point (2414,25) because another element &lt;div id=&#34;restrictModal&#34; class=&#34;modal fade in&#34;&gt; obscures it</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.34" class="none bg-info">
+        <tr id='pt43.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.34')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.34" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.34').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 118, in test_user_visibility_sidebar
-    self.change_user({&#39;show_32&#39;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1032, in change_user
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 80, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 633, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 321, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 242, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;show_32&#34; name=&#34;show_32&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (486,766) because another element &lt;div id=&#34;restrictModal&#34; class=&#34;modal fade in&#34;&gt; obscures it</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -6533,13 +4771,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c44', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -6548,7 +4786,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -6557,7 +4795,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -6566,7 +4804,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -6575,7 +4813,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -6584,7 +4822,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -6593,7 +4831,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -6602,7 +4840,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -6611,7 +4849,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -6620,7 +4858,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -6629,7 +4867,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -6638,7 +4876,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -6647,7 +4885,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -6656,7 +4894,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -6665,7 +4903,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -6674,7 +4912,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -6685,11 +4923,11 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>391</td>
-        <td>281</td>
-        <td>38</td>
-        <td>66</td>
-        <td>6</td>
+        <td>390</td>
+        <td>359</td>
+        <td>17</td>
+        <td>7</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -6717,7 +4955,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-22-generic #22~20.04.1-Ubuntu SMP Tue Nov 9 15:07:24 UTC 2021 x86_64 x86_64</td>
+              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -6729,7 +4967,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Babel</th>
-              <td>2.9.0</td>
+              <td>2.9.1</td>
               <td>Basic</td>
             </tr>
           
@@ -6739,15 +4977,21 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>chardet</th>
+              <td>4.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Flask</th>
-              <td>1.1.2</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Flask-Babel</th>
-              <td>1.0.0</td>
+              <td>2.0.0</td>
               <td>Basic</td>
             </tr>
           
@@ -6775,12 +5019,6 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>httplib2</th>
-              <td>0.14.0</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>iso-639</th>
               <td>0.4.5</td>
@@ -6789,25 +5027,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Jinja2</th>
-              <td>2.11.2</td>
+              <td>3.0.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>lxml</th>
-              <td>4.6.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>natsort</th>
-              <td>7.1.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>pyasn1</th>
-              <td>0.4.8</td>
+              <td>4.7.1</td>
               <td>Basic</td>
             </tr>
           
@@ -6819,31 +5045,19 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>pytz</th>
-              <td>2019.3</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>2021.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>requests</th>
-              <td>2.22.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>six</th>
-              <td>1.14.0</td>
+              <td>2.27.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.27</td>
+              <td>1.4.31</td>
               <td>Basic</td>
             </tr>
           
@@ -6855,7 +5069,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Unidecode</th>
-              <td>1.1.1</td>
+              <td>1.3.2</td>
               <td>Basic</td>
             </tr>
           
@@ -6867,13 +5081,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>Werkzeug</th>
-              <td>1.0.1</td>
+              <td>2.0.2</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -6897,13 +5111,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -6927,13 +5141,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -6957,13 +5171,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
             <tr>
               <th>comicapi</th>
-              <td>2.2.0</td>
+              <td>2.2.1</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -6975,7 +5189,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -6999,13 +5213,19 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
+            <tr>
+              <th>scholarly</th>
+              <td>1.5.1</td>
+              <td>TestLoadMetadataScholar</td>
+            </tr>
+          
             <tr>
               <th>google-api-python-client</th>
-              <td>2.32.0</td>
+              <td>2.36.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -7029,7 +5249,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>6.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -7047,13 +5267,13 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.4.0</td>
               <td>TestKoboSync</td>
             </tr>
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.4.0</td>
               <td>TestKoboSyncBig</td>
             </tr>
           
@@ -7065,7 +5285,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>jsonschema</th>
-              <td>4.2.1</td>
+              <td>4.4.0</td>
               <td>TestLdapLogin</td>
             </tr>
           
@@ -7083,7 +5303,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
           
             <tr>
               <th>SQLAlchemy-Utils</th>
-              <td>0.37.9</td>
+              <td>0.38.2</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -7095,7 +5315,7 @@ selenium.common.exceptions.ElementClickInterceptedException: Message: Element &l
 </div>
 
 <script>
-    drawCircle(281, 38, 66, 6);
+    drawCircle(359, 17, 7, 7);
     showCase(5);
 </script>
 

From 477b202c38caf90712c89bc074629d8d42fcd74f Mon Sep 17 00:00:00 2001
From: quarz12 <danielmartinqwe@gmail.com>
Date: Wed, 26 Jan 2022 10:41:42 +0100
Subject: [PATCH 087/220] import try catch

---
 cps/metadata_provider/amazon.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index f7738387..5c8522c7 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -2,7 +2,10 @@ import concurrent.futures
 import requests
 from bs4 import BeautifulSoup as BS  # requirement
 import lxml     #requirement for better speed
-import cchardet #optional for better speed
+try:
+    import cchardet #optional for better speed
+except ImportError:
+    pass
 from cps.services.Metadata import Metadata
 #from time import time
 from operator import itemgetter

From 6339d25af02818ddafa7e9be2e1e130d68bcaf71 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 26 Jan 2022 18:11:42 +0100
Subject: [PATCH 088/220] Bugfixes from testrun

---
 cps/editbooks.py                        |  3 +-
 cps/helper.py                           |  5 +-
 cps/templates/detail.html               |  2 +-
 cps/templates/feed.xml                  | 32 +++++------
 cps/ub.py                               |  2 +-
 test/Calibre-Web TestSummary_Linux.html | 70 ++++++++++++-------------
 6 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 84bd7b2b..20184bf9 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -809,7 +809,8 @@ def edit_book(book_id):
             if "cover_url" in to_save:
                 if to_save["cover_url"]:
                     if not current_user.role_upload():
-                        return "", (403)
+                        calibre_db.session.rollback()
+                        return "", 403
                     if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
                         book.has_cover = 0
                     else:
diff --git a/cps/helper.py b/cps/helper.py
index af90089b..2daf8494 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -435,7 +435,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         # Rename all files from old names to new names
         try:
             clean_author_database(renamed_author, calibrepath)
-            if first_author not in renamed_author:
+            if first_author and first_author not in renamed_author:
                 clean_author_database([first_author], calibrepath, localbook)
             if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
                 shutil.rmtree(os.path.dirname(path))
@@ -581,7 +581,8 @@ def update_dir_structure(book_id,
                         first_author=None,
                         orignal_filepath=None,
                         db_filename=None,
-                        renamed_author=False):
+                        renamed_author=None):
+    renamed_author = renamed_author or []
     if config.config_use_google_drive:
         return update_dir_structure_gdrive(book_id, first_author, renamed_author)
     else:
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index ef47bccc..06357ce8 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -38,7 +38,7 @@
           {% endif %}
             {% if g.user.kindle_mail and entry.kindle_list %}
               {% if entry.kindle_list.__len__() == 1 %}
-                <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=entry.kindle_list[0]['format'], convert=entry.kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.kindle_list[0]['text']}}</div>
+                <div id="sendbtn" data-action="{{url_for('web.send_to_kindle', book_id=entry.id, book_format=entry.kindle_list[0]['format'], convert=entry.kindle_list[0]['convert'])}}" data-text="{{_('Send to Kindle')}}" class="btn btn-primary postAction" role="button"><span class="glyphicon glyphicon-send"></span> {{entry.kindle_list[0]['text']}}</div>
               {% else %}
                 <div class="btn-group" role="group">
                   <button id="sendbtn2" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 9073142e..c2c6ab3c 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -40,35 +40,35 @@
   {% if entries and entries[0] %}
   {% for entry in entries %}
   <entry>
-    <title>{{entry.title}}</title>
-    <id>urn:uuid:{{entry.uuid}}</id>
-    <updated>{{entry.atom_timestamp}}</updated>
-    {% if entry.authors.__len__() > 0 %}
+    <title>{{entry[0].title}}</title>
+    <id>urn:uuid:{{entry[0].uuid}}</id>
+    <updated>{{entry[0].atom_timestamp}}</updated>
+    {% if entry[0].authors.__len__() > 0 %}
       <author>
-        <name>{{entry.authors[0].name}}</name>
+        <name>{{entry[0].authors[0].name}}</name>
       </author>
     {% endif %}
-    {% if entry.publishers.__len__() > 0 %}
+    {% if entry[0].publishers.__len__() > 0 %}
       <publisher>
-        <name>{{entry.publishers[0].name}}</name>
+        <name>{{entry[0].publishers[0].name}}</name>
       </publisher>
     {% endif %}
-    {% for lang in entry.languages %}
+    {% for lang in entry[0].languages %}
       <dcterms:language>{{lang.lang_code}}</dcterms:language>
     {% endfor %}
-    {% for tag in entry.tags %}
+    {% for tag in entry[0].tags %}
     <category scheme="http://www.bisg.org/standards/bisac_subject/index.html"
               term="{{tag.name}}"
               label="{{tag.name}}"/>
     {% endfor %}
-    {% if entry.comments[0] %}<summary>{{entry.comments[0].text|striptags}}</summary>{% endif %}
-    {% if entry.has_cover %}
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image"/>
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
+    {% if entry[0].comments[0] %}<summary>{{entry[0].comments[0].text|striptags}}</summary>{% endif %}
+    {% if entry[0].has_cover %}
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry[0].id)}}" rel="http://opds-spec.org/image"/>
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry[0].id)}}" rel="http://opds-spec.org/image/thumbnail"/>
     {% endif %}
-    {% for format in entry.data %}
-    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"
-          length="{{format.uncompressed_size}}" mtime="{{entry.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
+    {% for format in entry[0].data %}
+    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry[0].id, book_format=format.format|lower)}}"
+          length="{{format.uncompressed_size}}" mtime="{{entry[0].atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
     {% endfor %}
   </entry>
   {% endfor %}
diff --git a/cps/ub.py b/cps/ub.py
index c1d6d24c..e52ce201 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -90,7 +90,7 @@ def delete_user_session(user_id, session_key):
         session.query(User_Sessions).filter(User_Sessions.user_id==user_id,
                                             User_Sessions.session_key==session_key).delete()
         session.commit()
-    except (exc.OperationalError, exc.InvalidRequestError):
+    except (exc.OperationalError, exc.InvalidRequestError) as e:
         session.rollback()
         log.exception(e)
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index d3587088..c153a372 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-25 21:16:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-26 07:52:00</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>2022-01-26 01:13:49</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-26 11:49:33</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>3h 17 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 16 min</p>
         </div>
       </div>
       </div>
@@ -1982,13 +1982,13 @@ AssertionError: 9 != 10</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c14', 1)">Detail</a>
         </td>
@@ -1996,42 +1996,22 @@ AssertionError: 9 != 10</pre>
 
     
     
-        <tr id="ft14.1" class="none bg-danger">
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 136, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</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">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c15', 20)">Detail</a>
@@ -2049,11 +2029,31 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id="et15.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</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_et15.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et15.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et15.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 300, in test_edit_author
+    self.assertEqual(u&#39;O0ü 执&#39;, values[&#39;author&#39;][0])
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4925,8 +4925,8 @@ AssertionError: 200 != 500</pre>
         <td>Total</td>
         <td>390</td>
         <td>359</td>
-        <td>17</td>
-        <td>7</td>
+        <td>16</td>
+        <td>8</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5315,7 +5315,7 @@ AssertionError: 200 != 500</pre>
 </div>
 
 <script>
-    drawCircle(359, 17, 7, 7);
+    drawCircle(359, 16, 8, 7);
     showCase(5);
 </script>
 

From 341632376768b10664b78f367c2d948861181e02 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Wed, 26 Jan 2022 23:56:10 -0600
Subject: [PATCH 089/220] Removed title tags from cover images

---
 cps/templates/author.html   | 2 +-
 cps/templates/discover.html | 2 +-
 cps/templates/grid.html     | 2 +-
 cps/templates/image.html    | 7 ++-----
 cps/templates/index.html    | 4 ++--
 cps/templates/search.html   | 2 +-
 cps/templates/shelf.html    | 2 +-
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/cps/templates/author.html b/cps/templates/author.html
index 449efa53..9f124876 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -37,7 +37,7 @@
       <div class="cover">
         <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
             <span class="img" title="{{entry.title}}">
-              {{ image.book_cover(entry, title=author.name|safe) }}
+              {{ image.book_cover(entry, alt=author.name|safe) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index a39ba674..4842a7ea 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -10,7 +10,7 @@
         {% if entry.has_cover is defined %}
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img" title="{{entry.title}}">
-              {{ image.book_cover(entry, alt=entry.title) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/grid.html b/cps/templates/grid.html
index 7d3add5e..638b7245 100644
--- a/cps/templates/grid.html
+++ b/cps/templates/grid.html
@@ -28,7 +28,7 @@
                   <div class="cover">
                       <a href="{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].series[0].id )}}">
                           <span class="img" title="{{entry[0].series[0].name}}">
-                              {{ image.series(entry[0].series[0], title=entry[0].series[0].name|shortentitle) }}
+                              {{ image.series(entry[0].series[0], alt=entry[0].series[0].name|shortentitle) }}
                               <span class="badge">{{entry.count}}</span>
                             </span>
                       </a>
diff --git a/cps/templates/image.html b/cps/templates/image.html
index 728384a1..0bdba9a5 100644
--- a/cps/templates/image.html
+++ b/cps/templates/image.html
@@ -1,23 +1,20 @@
-{% macro book_cover(book, title=None, alt=None) -%}
+{% macro book_cover(book, alt=None) -%}
     {%- set image_title = book.title if book.title else book.name -%}
-    {%- set image_title = title if title else image_title -%}
     {%- set image_alt = alt if alt else image_title -%}
     {% set srcset = book|get_cover_srcset %}
     <img
         srcset="{{ srcset }}"
         src="{{ url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified) }}"
-        title="{{ image_title }}"
         alt="{{ image_alt }}"
     />
 {%- endmacro %}
 
-{% macro series(series, title=None, alt=None) -%}
+{% macro series(series, alt=None) -%}
     {%- set image_alt = alt if alt else image_title -%}
     {% set srcset = series|get_series_srcset %}
     <img
         srcset="{{ srcset }}"
         src="{{ url_for('web.get_series_cover', series_id=series.id, resolution='og', c='day'|cache_timestamp) }}"
-        title="{{ title }}"
         alt="{{ book_title }}"
     />
 {%- endmacro %}
diff --git a/cps/templates/index.html b/cps/templates/index.html
index ef872ccc..ff7ff115 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -10,7 +10,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img" title="{{ entry.title }}">
-                {{ image.book_cover(entry, alt=entry.title) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
@@ -92,7 +92,7 @@
       <div class="cover">
           <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img" title="{{ entry.title }}">
-              {{ image.book_cover(entry, alt=entry.title) }}
+              {{ image.book_cover(entry) }}
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 1bc741ca..12966348 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -46,7 +46,7 @@
         {% if entry.Books.has_cover is defined %}
            <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
             <span class="img" title="{{entry.Books.title}}" >
-                {{ image.book_cover(entry.Books, alt=entry.Books.title) }}
+                {{ image.book_cover(entry.Books) }}
                 {% if entry.Books.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 13a119c0..693f6b4a 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -35,7 +35,7 @@
       <div class="cover">
             <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
               <span class="img" title="{{entry.title}}" >
-                {{ image.book_cover(entry, alt=entry.title) }}
+                {{ image.book_cover(entry) }}
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>

From 50bb74d748f89668fe4abaac81b0c36ae77e66df Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Thu, 27 Jan 2022 00:35:45 -0600
Subject: [PATCH 090/220] Add CSRF support for schedule task settings, fixed
 details page not loading

---
 cps/schedule.py                      | 1 -
 cps/services/background_scheduler.py | 1 -
 cps/templates/detail.html            | 2 +-
 cps/templates/schedule_edit.html     | 1 +
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 2bb7878f..39c9bc09 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -16,7 +16,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import division, print_function, unicode_literals
 import datetime
 
 from . import config, constants
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 971b0bf7..415b2962 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -16,7 +16,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import division, print_function, unicode_literals
 import atexit
 
 from .. import logger
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 109b04d2..3bcf5cc6 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -5,7 +5,7 @@
     <div class="col-sm-3 col-lg-3 col-xs-5">
       <div class="cover">
         <!-- Always use full-sized image for the detail page -->
-        <img id="detailcover" title="{{book.title}}" src="{{url_for('web.get_cover', book_id=book.id, resolution='og', c=book|last_modified)}}" />
+        <img id="detailcover" title="{{entry.title}}" src="{{url_for('web.get_cover', book_id=entry.id, resolution='og', c=entry|last_modified)}}" />
       </div>
     </div>
     <div class="col-sm-9 col-lg-9 book-meta">
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index 71bb2d1a..f989baf9 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -7,6 +7,7 @@
 <div class="discover">
   <h1>{{title}}</h1>
   <form role="form" class="col-md-10 col-lg-6" method="POST" autocomplete="off">
+    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="form-group">
       <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
       <select name="schedule_start_time" id="schedule_start_time" class="form-control">

From 42f8209a4ae3a8e3b94c128cfa2f7b5195cb91e2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 28 Jan 2022 20:01:33 +0100
Subject: [PATCH 091/220] Fixed access to shelfs

---
 SECURITY.md  |  2 +-
 cps/kobo.py  |  6 ++---
 cps/shelf.py | 72 +++++++++++++++++++++++++++-------------------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 3e5a965d..262e66e2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -31,7 +31,7 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
 | V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
 | V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
-| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @ibarrionuevo         ||
+| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/kobo.py b/cps/kobo.py
index 67304c93..c5e7d1fe 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -552,11 +552,9 @@ def HandleTagUpdate(tag_id):
         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)
+        if not shelf_lib.delete_shelf_helper(shelf):
+            abort(401, description="Error deleting Shelf")
     else:
         name = None
         try:
diff --git a/cps/shelf.py b/cps/shelf.py
index ad6a2665..f57d0ad4 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -23,7 +23,7 @@
 import sys
 from datetime import datetime
 
-from flask import Blueprint, flash, redirect, request, url_for
+from flask import Blueprint, flash, redirect, request, url_for, abort
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -39,10 +39,10 @@ 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)
+        log.error("User {} not allowed to edit shelf: {}".format(current_user.id, cur_shelf.name))
         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)
+        log.info("User {} not allowed to edit public shelves".format(current_user.id))
         return False
     return True
 
@@ -51,7 +51,7 @@ 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)
+        log.error("User is unauthorized to view non-public shelf: {}".format(cur_shelf.name))
         return False
     return True
 
@@ -117,7 +117,7 @@ def add_to_shelf(shelf_id, book_id):
 def search_to_shelf(shelf_id):
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     if shelf is None:
-        log.error("Invalid shelf specified: %s", shelf_id)
+        log.error("Invalid shelf specified: {}".format(shelf_id))
         flash(_(u"Invalid shelf specified"), category="error")
         return redirect(url_for('web.index'))
 
@@ -228,7 +228,6 @@ def create_shelf():
     return create_edit_shelf(shelf, page_title=_(u"Create a Shelf"), page="shelfcreate")
 
 
-
 @shelf.route("/shelf/edit/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def edit_shelf(shelf_id):
@@ -320,12 +319,13 @@ def check_shelf_is_unique(shelf, title, is_public, shelf_id=False):
 
 def delete_shelf_helper(cur_shelf):
     if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
-        return
+        return False
     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.user_id))
     ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
+    return True
 
 
 @shelf.route("/shelf/delete/<int:shelf_id>", methods=["POST"])
@@ -333,8 +333,10 @@ def delete_shelf_helper(cur_shelf):
 def delete_shelf(shelf_id):
     cur_shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
     try:
-        delete_shelf_helper(cur_shelf)
-        flash(_("Shelf successfully deleted"), category="success")
+        if not delete_shelf_helper(cur_shelf):
+            flash(_("Error deleting Shelf"), category="error")
+        else:
+            flash(_("Shelf successfully deleted"), category="success")
     except InvalidRequestError:
         ub.session.rollback()
         log.error("Settings DB is not Writeable")
@@ -359,32 +361,35 @@ def show_shelf(shelf_id, sort_param, page):
 @shelf.route("/shelf/order/<int:shelf_id>", methods=["GET", "POST"])
 @login_required
 def order_shelf(shelf_id):
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
-            ub.BookShelf.order.asc()).all()
-        counter = 0
-        for book in books_in_shelf:
-            setattr(book, 'order', to_save[str(book.book_id)])
-            counter += 1
-            # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
-        try:
-            ub.session.commit()
-        except (OperationalError, InvalidRequestError):
-            ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
-
     shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
-    result = list()
     if shelf and check_shelf_view_permissions(shelf):
-        result = calibre_db.session.query(db.Books) \
-            .join(ub.BookShelf, ub.BookShelf.book_id == db.Books.id, isouter=True) \
-            .add_columns(calibre_db.common_filters().label("visible")) \
-            .filter(ub.BookShelf.shelf == shelf_id).order_by(ub.BookShelf.order.asc()).all()
-    return render_title_template('shelf_order.html', entries=result,
-                                 title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name),
-                                 shelf=shelf, page="shelforder")
+        if request.method == "POST":
+            to_save = request.form.to_dict()
+            books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id).order_by(
+                ub.BookShelf.order.asc()).all()
+            counter = 0
+            for book in books_in_shelf:
+                setattr(book, 'order', to_save[str(book.book_id)])
+                counter += 1
+                # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
+            try:
+                ub.session.commit()
+            except (OperationalError, InvalidRequestError):
+                ub.session.rollback()
+                log.error("Settings DB is not Writeable")
+                flash(_("Settings DB is not Writeable"), category="error")
+
+        result = list()
+        if shelf:
+            result = calibre_db.session.query(db.Books) \
+                .join(ub.BookShelf, ub.BookShelf.book_id == db.Books.id, isouter=True) \
+                .add_columns(calibre_db.common_filters().label("visible")) \
+                .filter(ub.BookShelf.shelf == shelf_id).order_by(ub.BookShelf.order.asc()).all()
+        return render_title_template('shelf_order.html', entries=result,
+                                     title=_(u"Change order of Shelf: '%(name)s'", name=shelf.name),
+                                     shelf=shelf, page="shelforder")
+    else:
+        abort(404)
 
 
 def change_shelf_order(shelf_id, order):
@@ -404,7 +409,6 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
 
     # check user is allowed to access shelf
     if shelf and check_shelf_view_permissions(shelf):
-
         if shelf_type == 1:
             # order = [ub.BookShelf.order.asc()]
             if sort_param == 'pubnew':

From 62ff6f7e8ad86e31e77f00e7f4ac0523b0b71ce5 Mon Sep 17 00:00:00 2001
From: mmonkey <mmonkey@gmail.com>
Date: Fri, 28 Jan 2022 23:48:44 -0600
Subject: [PATCH 092/220] Fixed tasks not running if scheduled time starts and
 ends on different days.

---
 cps/schedule.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 39c9bc09..5b97cecb 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -66,8 +66,7 @@ def register_scheduled_tasks():
             scheduler.schedule(func=end_scheduled_tasks, trigger='cron', hour=end)
 
         # Kick-off tasks, if they should currently be running
-        now = datetime.datetime.now().hour
-        if start <= now < end:
+        if should_task_be_running(start, end):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
 
 
@@ -77,9 +76,13 @@ def register_startup_tasks():
     if scheduler:
         start = config.schedule_start_time
         end = config.schedule_end_time
-        now = datetime.datetime.now().hour
 
         # Run scheduled tasks immediately for development and testing
         # Ignore tasks that should currently be running, as these will be added when registering scheduled tasks
-        if constants.APP_MODE in ['development', 'test'] and not (start <= now < end):
+        if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, end):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
+
+
+def should_task_be_running(start, end):
+    now = datetime.datetime.now().hour
+    return (start < end and start <= now < end) or (end < start <= now or now < end)

From 39ac37861fb377dea7962e77bc5043278b2b3d4c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 29 Jan 2022 10:44:33 +0100
Subject: [PATCH 093/220] Added option to enable reconnect Added option to
 perform dry run of updater Added possibility to exclude files from updater

---
 cps/__init__.py |  5 +++++
 cps/admin.py    | 14 +++++++++++-
 cps/cli.py      | 11 +++++++--
 cps/updater.py  | 60 ++++++++++++++++++++++++++++++++-----------------
 cps/web.py      |  7 ------
 exclude.txt     |  0
 6 files changed, 67 insertions(+), 30 deletions(-)
 create mode 100644 exclude.txt

diff --git a/cps/__init__.py b/cps/__init__.py
index 34ccf438..2bfee12e 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -186,4 +186,9 @@ def get_timezone():
 
 from .updater import Updater
 updater_thread = Updater()
+
+# Perform dry run of updater and exit afterwards
+if cli.dry_run:
+    updater_thread.dry_run()
+    sys.exit(0)
 updater_thread.start()
diff --git a/cps/admin.py b/cps/admin.py
index c1931ea4..814a455d 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -39,7 +39,7 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services
+from . import constants, logger, helper, services, cli
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, kobo_sync_status
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
@@ -158,6 +158,18 @@ def shutdown():
     return json.dumps(showtext), 400
 
 
+# method is available without login and not protected by CSRF to make it easy reachable, is per default switched of
+# needed for docker applications, as changes on metadata.db from host are not visible to application
+@admi.route("/reconnect", methods=['GET'])
+def reconnect():
+    if cli.args.r:
+        calibre_db.reconnect_db(config, ub.app_DB_path)
+        return json.dumps({})
+    else:
+        log.debug("'/reconnect' was accessed but is not enabled")
+        abort(404)
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
diff --git a/cps/cli.py b/cps/cli.py
index 31ea8417..a63d7282 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -40,12 +40,15 @@ parser.add_argument('-c', metavar='path',
                     help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
 parser.add_argument('-k', metavar='path',
                     help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
-parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-web',
+parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-Web',
                     version=version_info())
 parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
-parser.add_argument('-s', metavar='user:pass', help='Sets specific username to new password')
+parser.add_argument('-s', metavar='user:pass', help='Sets specific username to new password and exits Calibre-Web')
 parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
 parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
+parser.add_argument('-d', action='store_true', help='Dry run of updater to check file permissions in advance '
+                                                    'and exits Calibre-Web')
+parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
 args = parser.parse_args()
 
 settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
@@ -78,6 +81,9 @@ if (args.k and not args.c) or (not args.k and args.c):
 if args.k == "":
     keyfilepath = ""
 
+
+# dry run updater
+dry_run = args.d or None
 # load covers from localhost
 allow_localhost = args.l or None
 # handle and check ip address argument
@@ -106,3 +112,4 @@ if user_credentials and ":" not in user_credentials:
 
 if args.f:
     print("Warning: -f flag is depreciated and will be removed in next version")
+
diff --git a/cps/updater.py b/cps/updater.py
index 9090263f..1e11ff78 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -53,12 +53,10 @@ class Updater(threading.Thread):
     def __init__(self):
         threading.Thread.__init__(self)
         self.paused = False
-        # self.pause_cond = threading.Condition(threading.Lock())
         self.can_run = threading.Event()
         self.pause()
         self.status = -1
         self.updateIndex = None
-        # self.run()
 
     def get_current_version_info(self):
         if config.config_updatechannel == constants.UPDATE_STABLE:
@@ -85,15 +83,15 @@ class Updater(threading.Thread):
             log.debug(u'Extracting zipfile')
             tmp_dir = gettempdir()
             z.extractall(tmp_dir)
-            foldername = os.path.join(tmp_dir, z.namelist()[0])[:-1]
-            if not os.path.isdir(foldername):
+            folder_name = os.path.join(tmp_dir, z.namelist()[0])[:-1]
+            if not os.path.isdir(folder_name):
                 self.status = 11
                 log.info(u'Extracted contents of zipfile not found in temp folder')
                 self.pause()
                 return False
             self.status = 4
             log.debug(u'Replacing files')
-            if self.update_source(foldername, constants.BASE_DIR):
+            if self.update_source(folder_name, constants.BASE_DIR):
                 self.status = 6
                 log.debug(u'Preparing restart of server')
                 time.sleep(2)
@@ -184,7 +182,7 @@ class Updater(threading.Thread):
         return rf
 
     @classmethod
-    def check_permissions(cls, root_src_dir, root_dst_dir):
+    def check_permissions(cls, root_src_dir, root_dst_dir, logfunction):
         access = True
         remove_path = len(root_src_dir) + 1
         for src_dir, __, files in os.walk(root_src_dir):
@@ -193,7 +191,7 @@ class Updater(threading.Thread):
             if not os.path.isdir(root_dir): # root_dir.lstrip(os.sep).startswith('.') or
                 continue
             if not os.access(root_dir, os.R_OK|os.W_OK):
-                log.debug("Missing permissions for {}".format(root_dir))
+                logfunction("Missing permissions for {}".format(root_dir))
                 access = False
             for file_ in files:
                 curr_file = os.path.join(root_dir, file_)
@@ -201,7 +199,7 @@ class Updater(threading.Thread):
                 if not os.path.isfile(curr_file): # or curr_file.startswith('.'):
                     continue
                 if not os.access(curr_file, os.R_OK|os.W_OK):
-                    log.debug("Missing permissions for {}".format(curr_file))
+                    logfunction("Missing permissions for {}".format(curr_file))
                     access = False
         return access
 
@@ -258,18 +256,10 @@ class Updater(threading.Thread):
     def update_source(self, source, destination):
         # destination files
         old_list = list()
-        exclude = (
-            os.sep + 'app.db', os.sep + 'calibre-web.log1', os.sep + 'calibre-web.log2', os.sep + 'gdrive.db',
-            os.sep + 'vendor', os.sep + 'calibre-web.log', os.sep + '.git', os.sep + 'client_secrets.json',
-            os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv',
-            os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2',
-            os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so', os.sep + 'cps' + os.sep + '.HOMEDIR',
-            os.sep + 'gmail.json'
-        )
-        additional_path = self.is_venv()
+        exclude = self._add_excluded_files(log.info)
+        additional_path =self.is_venv()
         if additional_path:
-            exclude = exclude + (additional_path,)
-
+            exclude.append(additional_path)
         # check if we are in a package, rename cps.py to __init__.py
         if constants.HOME_CONFIG:
             shutil.move(os.path.join(source, 'cps.py'), os.path.join(source, '__init__.py'))
@@ -293,7 +283,7 @@ class Updater(threading.Thread):
 
         remove_items = self.reduce_dirs(rf, new_list)
 
-        if self.check_permissions(source, destination):
+        if self.check_permissions(source, destination, log.debug):
             self.moveallfiles(source, destination)
 
             for item in remove_items:
@@ -332,6 +322,12 @@ class Updater(threading.Thread):
         log.debug("Stable version: {}".format(constants.STABLE_VERSION))
         return constants.STABLE_VERSION  # Current version
 
+    @classmethod
+    def dry_run(cls):
+        cls._add_excluded_files(print)
+        cls.check_permissions(constants.BASE_DIR, constants.BASE_DIR, print)
+        print("\n*** Finished ***")
+
     @staticmethod
     def _populate_parent_commits(update_data, status, locale, tz, parents):
         try:
@@ -391,6 +387,30 @@ class Updater(threading.Thread):
             status['message'] = _(u'General error')
         return status, update_data
 
+    @staticmethod
+    def _add_excluded_files(logfunction):
+        excluded_files = [
+            os.sep + 'app.db', os.sep + 'calibre-web.log1', os.sep + 'calibre-web.log2', os.sep + 'gdrive.db',
+            os.sep + 'vendor', os.sep + 'calibre-web.log', os.sep + '.git', os.sep + 'client_secrets.json',
+            os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv',
+            os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2',
+            os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so', os.sep + 'cps' + os.sep + '.HOMEDIR',
+            os.sep + 'gmail.json', os.sep + 'exclude.txt'
+        ]
+        try:
+            with open(os.path.join(constants.BASE_DIR, "exclude.txt"), "r") as f:
+                lines = f.readlines()
+            for line in lines:
+                proccessed_line = line.strip("\n\r ").strip("\"'").lstrip("\\/ ").\
+                    replace("\\", os.sep).replace("/", os.sep)
+                if os.path.exists(os.path.join(constants.BASE_DIR, proccessed_line)):
+                    excluded_files.append(os.sep + proccessed_line)
+                else:
+                    logfunction("File list for updater: {} not found".format(line))
+        except (PermissionError, FileNotFoundError):
+            logfunction("Excluded file list for updater not found, or not accessible")
+        return excluded_files
+
     def _nightly_available_updates(self, request_method, locale):
         tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)
         if request_method == "GET":
diff --git a/cps/web.py b/cps/web.py
index 7ecb7e0e..018c0002 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1104,13 +1104,6 @@ def get_tasks_status():
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
 
-# method is available without login and not protected by CSRF to make it easy reachable
-@app.route("/reconnect", methods=['GET'])
-def reconnect():
-    calibre_db.reconnect_db(config, ub.app_DB_path)
-    return json.dumps({})
-
-
 # ################################### Search functions ################################################################
 
 @web.route("/search", methods=["GET"])
diff --git a/exclude.txt b/exclude.txt
new file mode 100644
index 00000000..e69de29b

From bb7f4cf74e86b163546c7dc819b67c99b1d1e682 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 29 Jan 2022 21:02:56 +0100
Subject: [PATCH 094/220] Added optional requirements for metadata amazon
 Better logging of errors in metadata source files

---
 cps/metadata_provider/amazon.py | 2 +-
 cps/search_metadata.py          | 4 ++--
 optional-requirements.txt       | 8 +++++---
 setup.cfg                       | 5 +++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index af926dbf..558edebc 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -19,7 +19,7 @@
 import concurrent.futures
 import requests
 from bs4 import BeautifulSoup as BS  # requirement
-# import lxml     #requirement for better speed
+
 try:
     import cchardet #optional for better speed
 except ImportError:
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 4b57bf9e..d72273f6 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -49,8 +49,8 @@ for f in modules:
         try:
             importlib.import_module("cps.metadata_provider." + a)
             new_list.append(a)
-        except ImportError:
-            log.error("Import error for metadata source: {}".format(a))
+        except ImportError as e:
+            log.error("Import error for metadata source: {} - {}".format(a, e))
             pass
 
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 20996c8a..e13f32f5 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -31,9 +31,11 @@ SQLAlchemy-Utils>=0.33.5,<0.39.0
 # metadata extraction
 rarfile>=2.7
 scholarly>=1.2.0,<1.6
-markdown2==2.4.2
-html2text==2020.1.16
-python-dateutil==2.8.2
+markdown2>=2.0.0,<2.5.0
+html2text>=2020.1.16,<2022.1.1
+python-dateutil>=2.1,<2.9.0
+beautifulsoup4>=4.0.1,<4.2.0
+cchardet>=2.0.0,<2.2.0
 
 # Comics
 natsort>=2.2.0,<8.1.0
diff --git a/setup.cfg b/setup.cfg
index db2fd3e6..e6b61e9d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -86,6 +86,11 @@ oauth =
 metadata = 
 	rarfile>=2.7
 	scholarly>=1.2.0,<1.6
+	markdown2>=2.0.0,<2.5.0
+	html2text>=2020.1.16,<2022.1.1
+	python-dateutil>=2.1,<2.9.0
+	beautifulsoup4>=4.0.1,<4.2.0
+	cchardet>=2.0.0,<2.2.0
 comics = 
 	natsort>=2.2.0,<8.1.0
 	comicapi>=2.2.0,<2.3.0

From f6b46bb1703a21c00100767ec955f29195a2ec96 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 29 Jan 2022 21:22:39 +0100
Subject: [PATCH 095/220] Code cosmetics

---
 cps/admin.py     | 53 +++++++++++++++++++++++++++++-------------------
 cps/constants.py | 23 ++++++++++++---------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 814a455d..0bed27f0 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -47,10 +47,7 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from . import debug_info, _BABEL_TRANSLATIONS
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
+from functools import wraps
 
 log = logger.create()
 
@@ -199,6 +196,7 @@ def admin():
                                  feature_support=feature_support, kobo_support=kobo_support,
                                  title=_(u"Admin page"), page="admin")
 
+
 @admi.route("/admin/dbconfig", methods=["GET", "POST"])
 @login_required
 @admin_required
@@ -239,6 +237,7 @@ def ajax_db_config():
 def calibreweb_alive():
     return "", 200
 
+
 @admi.route("/admin/viewconfig")
 @login_required
 @admin_required
@@ -255,6 +254,7 @@ def view_configuration():
                                  translations=translations,
                                  title=_(u"UI Configuration"), page="uiconfig")
 
+
 @admi.route("/admin/usertable")
 @login_required
 @admin_required
@@ -316,8 +316,8 @@ def list_users():
 
     if search:
         all_user = all_user.filter(or_(func.lower(ub.User.name).ilike("%" + search + "%"),
-                                    func.lower(ub.User.kindle_mail).ilike("%" + search + "%"),
-                                    func.lower(ub.User.email).ilike("%" + search + "%")))
+                                       func.lower(ub.User.kindle_mail).ilike("%" + search + "%"),
+                                       func.lower(ub.User.email).ilike("%" + search + "%")))
     if state:
         users = calibre_db.get_checkbox_sorted(all_user.all(), state, off, limit, request.args.get("order", "").lower())
     else:
@@ -337,12 +337,14 @@ def list_users():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @admi.route("/ajax/deleteuser", methods=['POST'])
 @login_required
 @admin_required
 def delete_user():
     user_ids = request.form.to_dict(flat=False)
     users = None
+    message = ""
     if "userid[]" in user_ids:
         users = ub.session.query(ub.User).filter(ub.User.id.in_(user_ids['userid[]'])).all()
     elif "userid" in user_ids:
@@ -370,6 +372,7 @@ def delete_user():
     success.extend(errors)
     return Response(json.dumps(success), mimetype='application/json')
 
+
 @admi.route("/ajax/getlocale")
 @login_required
 @admin_required
@@ -429,9 +432,9 @@ def edit_list_user(param):
                     if user.name == "Guest":
                         raise Exception(_("Guest Name can't be changed"))
                     user.name = check_username(vals['value'])
-                elif param =='email':
+                elif param == 'email':
                     user.email = check_email(vals['value'])
-                elif param =='kobo_only_shelves_sync':
+                elif param == 'kobo_only_shelves_sync':
                     user.kobo_only_shelves_sync = int(vals['value'] == 'true')
                 elif param == 'kindle_mail':
                     user.kindle_mail = valid_email(vals['value']) if vals['value'] else ""
@@ -451,8 +454,8 @@ def edit_list_user(param):
                                               ub.User.id != user.id).count():
                                     return Response(
                                         json.dumps([{'type': "danger",
-                                                     'message':_(u"No admin user remaining, can't remove admin role",
-                                                                 nick=user.name)}]), mimetype='application/json')
+                                                     'message': _(u"No admin user remaining, can't remove admin role",
+                                                                  nick=user.name)}]), mimetype='application/json')
                             user.role &= ~value
                         else:
                             raise Exception(_("Value has to be true or false"))
@@ -515,6 +518,7 @@ def update_table_settings():
         return "Invalid request", 400
     return ""
 
+
 def check_valid_read_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -522,6 +526,7 @@ def check_valid_read_column(column):
             return False
     return True
 
+
 def check_valid_restricted_column(column):
     if column != "0":
         if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
@@ -560,7 +565,6 @@ def update_view_configuration():
     _config_string(to_save, "config_default_language")
     _config_string(to_save, "config_default_locale")
 
-
     config.config_default_role = constants.selected_roles(to_save)
     config.config_default_role &= ~constants.ROLE_ANONYMOUS
 
@@ -597,13 +601,15 @@ def load_dialogtexts(element_id):
     elif element_id == "restrictions":
         texts["main"] = _('Are you sure you want to change the selected restrictions for the selected user(s)?')
     elif element_id == "sidebar_view":
-        texts["main"] = _('Are you sure you want to change the selected visibility restrictions for the selected user(s)?')
+        texts["main"] = _('Are you sure you want to change the selected visibility restrictions '
+                          'for the selected user(s)?')
     elif element_id == "kobo_only_shelves_sync":
         texts["main"] = _('Are you sure you want to change shelf sync behavior for the selected user(s)?')
     elif element_id == "db_submit":
         texts["main"] = _('Are you sure you want to change Calibre library location?')
     elif element_id == "btnfullsync":
-        texts["main"] = _("Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?")
+        texts["main"] = _("Are you sure you want delete Calibre-Web's sync database "
+                          "to force a full sync with your Kobo Reader?")
     return json.dumps(texts)
 
 
@@ -774,6 +780,7 @@ def prepare_tags(user, action, tags_name, id_list):
 def add_user_0_restriction(res_type):
     return add_restriction(res_type, 0)
 
+
 @admi.route("/ajax/addrestriction/<int:res_type>/<int:user_id>", methods=['POST'])
 @login_required
 @admin_required
@@ -880,8 +887,8 @@ def delete_restriction(res_type, user_id):
 @admin_required
 def list_restriction(res_type, user_id):
     if res_type == 0:   # Tags as template
-        restrict = [{'Element': x, 'type':_('Deny'), 'id': 'd'+str(i) }
-                    for i,x in enumerate(config.list_denied_tags()) if x != '']
+        restrict = [{'Element': x, 'type': _('Deny'), 'id': 'd'+str(i)}
+                    for i, x in enumerate(config.list_denied_tags()) if x != '']
         allow = [{'Element': x, 'type': _('Allow'), 'id': 'a'+str(i)}
                  for i, x in enumerate(config.list_allowed_tags()) if x != '']
         json_dumps = restrict + allow
@@ -918,6 +925,7 @@ def list_restriction(res_type, user_id):
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @admi.route("/ajax/fullsync", methods=["POST"])
 @login_required
 def ajax_fullsync():
@@ -1179,7 +1187,7 @@ def simulatedbchange():
 
 def _db_simulate_change():
     param = request.form.to_dict()
-    to_save = {}
+    to_save = dict()
     to_save['config_calibre_dir'] = re.sub(r'[\\/]metadata\.db$',
                                            '',
                                            param['config_calibre_dir'],
@@ -1236,6 +1244,7 @@ def _db_configuration_update_helper():
     config.save()
     return _db_configuration_result(None, gdrive_error)
 
+
 def _configuration_update_helper():
     reboot_required = False
     to_save = request.form.to_dict()
@@ -1325,6 +1334,7 @@ def _configuration_update_helper():
 
     return _configuration_result(None, reboot_required)
 
+
 def _configuration_result(error_flash=None, reboot=False):
     resp = {}
     if error_flash:
@@ -1332,9 +1342,9 @@ def _configuration_result(error_flash=None, reboot=False):
         config.load()
         resp['result'] = [{'type': "danger", 'message': error_flash}]
     else:
-        resp['result'] = [{'type': "success", 'message':_(u"Calibre-Web configuration updated")}]
+        resp['result'] = [{'type': "success", 'message': _(u"Calibre-Web configuration updated")}]
     resp['reboot'] = reboot
-    resp['config_upload']= config.config_upload_formats
+    resp['config_upload'] = config.config_upload_formats
     return Response(json.dumps(resp), mimetype='application/json')
 
 
@@ -1416,6 +1426,7 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
         log.error("Settings DB is not Writeable")
         flash(_("Settings DB is not Writeable"), category="error")
 
+
 def _delete_user(content):
     if ub.session.query(ub.User).filter(ub.User.role.op('&')(constants.ROLE_ADMIN) == constants.ROLE_ADMIN,
                                         ub.User.id != content.id).count():
@@ -1439,7 +1450,7 @@ def _delete_user(content):
                 ub.session.delete(kobo_entry)
             ub.session_commit()
             log.info("User {} deleted".format(content.name))
-            return(_("User '%(nick)s' deleted", nick=content.name))
+            return _("User '%(nick)s' deleted", nick=content.name)
         else:
             log.warning(_("Can't delete Guest User"))
             raise Exception(_("Can't delete Guest User"))
@@ -1737,7 +1748,7 @@ def get_updater_status():
         if request.method == "POST":
             commit = request.form.to_dict()
             if "start" in commit and commit['start'] == 'True':
-                text = {
+                txt = {
                     "1": _(u'Requesting update package'),
                     "2": _(u'Downloading update package'),
                     "3": _(u'Unzipping update package'),
@@ -1752,7 +1763,7 @@ def get_updater_status():
                     "12": _(u'Update failed:') + u' ' + _(u'Update file could not be saved in temp dir'),
                     "13": _(u'Update failed:') + u' ' + _(u'Files could not be replaced during update')
                 }
-                status['text'] = text
+                status['text'] = txt
                 updater_thread.status = 0
                 updater_thread.resume()
                 status['status'] = updater_thread.get_update_status()
diff --git a/cps/constants.py b/cps/constants.py
index 0a964fb7..f9003125 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -21,22 +21,22 @@ import os
 from collections import namedtuple
 from sqlalchemy import __version__ as sql_version
 
-sqlalchemy_version2 = ([int(x) for x in sql_version.split('.')] >= [2,0,0])
+sqlalchemy_version2 = ([int(x) for x in sql_version.split('.')] >= [2, 0, 0])
 
 # if installed via pip this variable is set to true (empty file with name .HOMEDIR present)
 HOME_CONFIG = os.path.isfile(os.path.join(os.path.dirname(os.path.abspath(__file__)), '.HOMEDIR'))
 
-#In executables updater is not available, so variable is set to False there
+# In executables updater is not available, so variable is set to False there
 UPDATER_AVAILABLE = True
 
 # Base dir is parent of current file, necessary if called from different folder
-BASE_DIR            = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),os.pardir))
+BASE_DIR            = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir))
 STATIC_DIR          = os.path.join(BASE_DIR, 'cps', 'static')
 TEMPLATES_DIR       = os.path.join(BASE_DIR, 'cps', 'templates')
 TRANSLATIONS_DIR    = os.path.join(BASE_DIR, 'cps', 'translations')
 
 if HOME_CONFIG:
-    home_dir = os.path.join(os.path.expanduser("~"),".calibre-web")
+    home_dir = os.path.join(os.path.expanduser("~"), ".calibre-web")
     if not os.path.exists(home_dir):
         os.makedirs(home_dir)
     CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', home_dir)
@@ -133,11 +133,14 @@ except ValueError:
 del env_CALIBRE_PORT
 
 
-EXTENSIONS_AUDIO    = {'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'}
-EXTENSIONS_CONVERT_FROM  = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt','cbz','cbr']
-EXTENSIONS_CONVERT_TO  = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt']
-EXTENSIONS_UPLOAD   = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx',
-                       'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'}
+EXTENSIONS_AUDIO = {'mp3', 'mp4', 'ogg', 'opus', 'wav', 'flac', 'm4a', 'm4b'}
+EXTENSIONS_CONVERT_FROM = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf',
+                           'txt', 'htmlz', 'rtf', 'odt', 'cbz', 'cbr']
+EXTENSIONS_CONVERT_TO = ['pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2',
+                         'lit', 'lrf', 'txt', 'htmlz', 'rtf', 'odt']
+EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'kepub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu',
+                     'prc', 'doc', 'docx', 'fb2', 'html', 'rtf', 'lit', 'odt', 'mp3', 'mp4', 'ogg',
+                     'opus', 'wav', 'flac', 'm4a', 'm4b'}
 
 
 def has_flag(value, bit_flag):
@@ -153,7 +156,7 @@ BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, d
 
 STABLE_VERSION = {'version': '0.6.17 Beta'}
 
-NIGHTLY_VERSION = {}
+NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
 NIGHTLY_VERSION[1] = '$Format:%cI$'
 # NIGHTLY_VERSION[0] = 'bb7d2c6273ae4560e83950d36d64533343623a57'

From 3123a914a456eb11076da09f6c84e7309de2d3b2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 10:57:29 +0100
Subject: [PATCH 096/220] Updated test results Fix updater Added comment
 regarding code taken from calibre source

---
 cps/services/Metadata.py                |   4 +
 cps/updater.py                          |  48 +-
 test/Calibre-Web TestSummary_Linux.html | 965 ++++++++++++++----------
 3 files changed, 615 insertions(+), 402 deletions(-)

diff --git a/cps/services/Metadata.py b/cps/services/Metadata.py
index f4a5662c..ab4fd482 100644
--- a/cps/services/Metadata.py
+++ b/cps/services/Metadata.py
@@ -72,6 +72,10 @@ class Metadata:
     ) -> Generator[str, None, None]:
         """
         Taken from calibre source code
+        It's a simplified (cut out what is unnecessary) version of
+        https://github.com/kovidgoyal/calibre/blob/99d85b97918625d172227c8ffb7e0c71794966c0/
+        src/calibre/ebooks/metadata/sources/base.py#L363-L367
+        (src/calibre/ebooks/metadata/sources/base.py - lines 363-398)
         """
         title_patterns = [
             (re.compile(pat, re.IGNORECASE), repl)
diff --git a/cps/updater.py b/cps/updater.py
index 1e11ff78..2166b334 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -182,29 +182,30 @@ class Updater(threading.Thread):
         return rf
 
     @classmethod
-    def check_permissions(cls, root_src_dir, root_dst_dir, logfunction):
+    def check_permissions(cls, root_src_dir, root_dst_dir, log_function):
         access = True
         remove_path = len(root_src_dir) + 1
         for src_dir, __, files in os.walk(root_src_dir):
             root_dir = os.path.join(root_dst_dir, src_dir[remove_path:])
-            # Skip non existing folders on check
-            if not os.path.isdir(root_dir): # root_dir.lstrip(os.sep).startswith('.') or
+            # Skip non-existing folders on check
+            if not os.path.isdir(root_dir):
                 continue
-            if not os.access(root_dir, os.R_OK|os.W_OK):
-                logfunction("Missing permissions for {}".format(root_dir))
+            if not os.access(root_dir, os.R_OK | os.W_OK):
+                log_function("Missing permissions for {}".format(root_dir))
                 access = False
             for file_ in files:
                 curr_file = os.path.join(root_dir, file_)
-                # Skip non existing files on check
-                if not os.path.isfile(curr_file): # or curr_file.startswith('.'):
+                # Skip non-existing files on check
+                if not os.path.isfile(curr_file):  # or curr_file.startswith('.'):
                     continue
-                if not os.access(curr_file, os.R_OK|os.W_OK):
-                    logfunction("Missing permissions for {}".format(curr_file))
+                if not os.access(curr_file, os.R_OK | os.W_OK):
+                    log_function("Missing permissions for {}".format(curr_file))
                     access = False
         return access
 
     @classmethod
-    def moveallfiles(cls, root_src_dir, root_dst_dir):
+    def move_all_files(cls, root_src_dir, root_dst_dir):
+        permission = None
         new_permissions = os.stat(root_dst_dir)
         log.debug('Performing Update on OS-System: %s', sys.platform)
         change_permissions = not (sys.platform == "win32" or sys.platform == "darwin")
@@ -257,9 +258,10 @@ class Updater(threading.Thread):
         # destination files
         old_list = list()
         exclude = self._add_excluded_files(log.info)
-        additional_path =self.is_venv()
+        additional_path = self.is_venv()
         if additional_path:
             exclude.append(additional_path)
+        exclude = tuple(exclude)
         # check if we are in a package, rename cps.py to __init__.py
         if constants.HOME_CONFIG:
             shutil.move(os.path.join(source, 'cps.py'), os.path.join(source, '__init__.py'))
@@ -284,7 +286,7 @@ class Updater(threading.Thread):
         remove_items = self.reduce_dirs(rf, new_list)
 
         if self.check_permissions(source, destination, log.debug):
-            self.moveallfiles(source, destination)
+            self.move_all_files(source, destination)
 
             for item in remove_items:
                 item_path = os.path.join(destination, item[1:])
@@ -336,6 +338,7 @@ class Updater(threading.Thread):
             remaining_parents_cnt = 10
         except (IndexError, KeyError):
             remaining_parents_cnt = None
+            parent_commit = None
 
         if remaining_parents_cnt is not None:
             while True:
@@ -388,7 +391,7 @@ class Updater(threading.Thread):
         return status, update_data
 
     @staticmethod
-    def _add_excluded_files(logfunction):
+    def _add_excluded_files(log_function):
         excluded_files = [
             os.sep + 'app.db', os.sep + 'calibre-web.log1', os.sep + 'calibre-web.log2', os.sep + 'gdrive.db',
             os.sep + 'vendor', os.sep + 'calibre-web.log', os.sep + '.git', os.sep + 'client_secrets.json',
@@ -401,14 +404,14 @@ class Updater(threading.Thread):
             with open(os.path.join(constants.BASE_DIR, "exclude.txt"), "r") as f:
                 lines = f.readlines()
             for line in lines:
-                proccessed_line = line.strip("\n\r ").strip("\"'").lstrip("\\/ ").\
+                processed_line = line.strip("\n\r ").strip("\"'").lstrip("\\/ ").\
                     replace("\\", os.sep).replace("/", os.sep)
-                if os.path.exists(os.path.join(constants.BASE_DIR, proccessed_line)):
-                    excluded_files.append(os.sep + proccessed_line)
+                if os.path.exists(os.path.join(constants.BASE_DIR, processed_line)):
+                    excluded_files.append(os.sep + processed_line)
                 else:
-                    logfunction("File list for updater: {} not found".format(line))
+                    log_function("File list for updater: {} not found".format(line))
         except (PermissionError, FileNotFoundError):
-            logfunction("Excluded file list for updater not found, or not accessible")
+            log_function("Excluded file list for updater not found, or not accessible")
         return excluded_files
 
     def _nightly_available_updates(self, request_method, locale):
@@ -469,7 +472,7 @@ class Updater(threading.Thread):
         return ''
 
     def _stable_updater_set_status(self, i, newer, status, parents, commit):
-        if i == -1 and newer == False:
+        if i == -1 and newer is False:
             status.update({
                 'update': True,
                 'success': True,
@@ -478,7 +481,7 @@ class Updater(threading.Thread):
                 'history': parents
             })
             self.updateFile = commit[0]['zipball_url']
-        elif i == -1 and newer == True:
+        elif i == -1 and newer is True:
             status.update({
                 'update': True,
                 'success': True,
@@ -515,6 +518,7 @@ class Updater(threading.Thread):
         return status, parents
 
     def _stable_available_updates(self, request_method):
+        status = None
         if request_method == "GET":
             parents = []
             # repository_url = 'https://api.github.com/repos/flatpak/flatpak/releases'  # test URL
@@ -559,7 +563,7 @@ class Updater(threading.Thread):
                 except ValueError:
                     current_version[2] = int(current_version[2].split(' ')[0])-1
 
-                # Check if major versions are identical search for newest non equal commit and update to this one
+                # Check if major versions are identical search for newest non-equal commit and update to this one
                 if major_version_update == current_version[0]:
                     if (minor_version_update == current_version[1] and
                             patch_version_update > current_version[2]) or \
@@ -572,7 +576,7 @@ class Updater(threading.Thread):
                     i -= 1
                     continue
                 if major_version_update > current_version[0]:
-                    # found update update to last version before major update, unless current version is on last version
+                    # found update to last version before major update, unless current version is on last version
                     # before major update
                     if i == (len(commit) - 1):
                         i -= 1
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 9fc44030..0004c7a0 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-27 10:57:52</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-29 21:23:00</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>2022-01-27 14:58:14</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-30 01:22:23</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>3h 19 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 18 min</p>
         </div>
       </div>
       </div>
@@ -236,13 +236,13 @@
 
     <tr id="su" class="passClass">
         <td>TestCli</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('c2', 8)">Detail</a>
+            <a onclick="showClassDetail('c2', 9)">Detail</a>
         </td>
     </tr>
 
@@ -304,7 +304,7 @@
     
         <tr id='pt2.7' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestCli - test_environ_port_setting</div>
+                <div class='testcase'>TestCli - test_dryrun_update</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -312,6 +312,15 @@
     
     
         <tr id='pt2.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_environ_port_setting</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
@@ -411,11 +420,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -461,11 +470,33 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id="ft6.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</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_ft6.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 357, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1273,6 +1304,30 @@
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestEditAuthors</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c12', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
@@ -1281,13 +1336,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 18)">Detail</a>
+            <a onclick="showClassDetail('c13', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1296,7 +1351,7 @@
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1305,7 +1360,7 @@
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1314,7 +1369,7 @@
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1323,7 +1378,7 @@
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1332,7 +1387,7 @@
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1341,7 +1396,7 @@
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt13.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1350,7 +1405,7 @@
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt13.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1359,7 +1414,7 @@
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt13.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1368,7 +1423,7 @@
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt13.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1377,7 +1432,7 @@
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt13.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1386,7 +1441,7 @@
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt13.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1395,7 +1450,7 @@
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt13.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1404,7 +1459,7 @@
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt13.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1413,7 +1468,7 @@
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt13.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1422,7 +1477,7 @@
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt13.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1431,7 +1486,7 @@
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt13.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1440,7 +1495,7 @@
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt13.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1450,45 +1505,25 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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', 1)">Detail</a>
+            <a onclick="showClassDetail('c14', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 158, in test_load_metadata
-    self.assertLessEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.001)
-AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1502,13 +1537,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <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'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1517,7 +1552,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1526,7 +1561,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1535,7 +1570,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1544,7 +1579,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1553,7 +1588,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1562,7 +1597,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1571,7 +1606,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1580,7 +1615,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1589,7 +1624,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1598,7 +1633,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1607,7 +1642,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1616,7 +1651,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1625,7 +1660,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1634,7 +1669,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1643,7 +1678,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1652,7 +1687,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1661,7 +1696,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1670,7 +1705,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.19' class='hiddenRow bg-success'>
+        <tr id='pt15.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1679,7 +1714,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt14.20' class='hiddenRow bg-success'>
+        <tr id='pt15.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1689,25 +1724,45 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="ft16.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</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_ft16.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
+    self.assertEqual(30, len(results))
+AssertionError: 30 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1721,13 +1776,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 3)">Detail</a>
+            <a onclick="showClassDetail('c17', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1736,7 +1791,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1745,7 +1800,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1763,13 +1818,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</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'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1778,7 +1833,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1787,7 +1842,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1796,7 +1851,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1805,7 +1860,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1814,7 +1869,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1823,7 +1878,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1841,13 +1896,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c19', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1865,13 +1920,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 2)">Detail</a>
+            <a onclick="showClassDetail('c20', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1880,7 +1935,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -1898,13 +1953,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 3)">Detail</a>
+            <a onclick="showClassDetail('c21', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -1913,19 +1968,19 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id="st20.2" class="none bg-warning">
+        <tr id="st21.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st20.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st21.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st20.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st21.2" 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_st20.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st21.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1939,7 +1994,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -1957,13 +2012,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c22', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1981,13 +2036,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -1996,7 +2051,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2005,7 +2060,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2015,21 +2070,21 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">11</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 11)">Detail</a>
+            <a onclick="showClassDetail('c24', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2038,7 +2093,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2047,7 +2102,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2056,7 +2111,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2065,7 +2120,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id='pt24.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2074,7 +2129,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.6' class='hiddenRow bg-success'>
+        <tr id='pt24.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2083,7 +2138,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.7' class='hiddenRow bg-success'>
+        <tr id='pt24.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2092,7 +2147,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.8' class='hiddenRow bg-success'>
+        <tr id='pt24.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2101,16 +2156,36 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.9' class='hiddenRow bg-success'>
+        <tr id="ft24.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</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_ft24.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
+    self.assertEqual(1, len(data), data)
+AssertionError: 1 != 0 : []</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt23.10' class='hiddenRow bg-success'>
+        <tr id='pt24.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2119,7 +2194,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt23.11' class='hiddenRow bg-success'>
+        <tr id='pt24.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2137,13 +2212,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 5)">Detail</a>
+            <a onclick="showClassDetail('c25', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2152,7 +2227,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2161,7 +2236,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2170,7 +2245,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2179,7 +2254,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2197,13 +2272,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 13)">Detail</a>
+            <a onclick="showClassDetail('c26', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2212,7 +2287,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2221,7 +2296,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2230,7 +2305,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2239,7 +2314,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2248,7 +2323,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2257,7 +2332,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2266,7 +2341,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2275,7 +2350,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2284,7 +2359,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2293,7 +2368,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2302,7 +2377,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.12' class='hiddenRow bg-success'>
+        <tr id='pt26.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2311,7 +2386,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt25.13' class='hiddenRow bg-success'>
+        <tr id='pt26.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2329,13 +2404,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 8)">Detail</a>
+            <a onclick="showClassDetail('c27', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2344,7 +2419,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2353,7 +2428,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2362,7 +2437,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2371,7 +2446,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2380,7 +2455,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2389,7 +2464,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2398,7 +2473,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2416,13 +2491,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 9)">Detail</a>
+            <a onclick="showClassDetail('c28', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2431,7 +2506,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2440,7 +2515,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2449,7 +2524,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2458,19 +2533,19 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id="st27.5" class="none bg-warning">
+        <tr id="st28.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st27.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st28.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_st27.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st28.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2484,7 +2559,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2493,7 +2568,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2502,7 +2577,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2511,7 +2586,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2529,13 +2604,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 15)">Detail</a>
+            <a onclick="showClassDetail('c29', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2544,7 +2619,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2553,7 +2628,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2562,7 +2637,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2571,7 +2646,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2580,7 +2655,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2589,7 +2664,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2598,7 +2673,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2607,7 +2682,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2616,7 +2691,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2625,7 +2700,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2634,7 +2709,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2643,7 +2718,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2652,7 +2727,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2661,7 +2736,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt28.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2679,13 +2754,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 2)">Detail</a>
+            <a onclick="showClassDetail('c30', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2694,7 +2769,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2712,13 +2787,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2727,7 +2802,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2745,13 +2820,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 23)">Detail</a>
+            <a onclick="showClassDetail('c32', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2760,7 +2835,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2769,7 +2844,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt32.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2778,7 +2853,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt32.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2787,7 +2862,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt32.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2796,7 +2871,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt32.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2805,7 +2880,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt32.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2814,7 +2889,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt32.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2823,7 +2898,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt32.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2832,7 +2907,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt32.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2841,7 +2916,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt32.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2850,7 +2925,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt32.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2859,7 +2934,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt32.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2868,7 +2943,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt32.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2877,7 +2952,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt32.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2886,7 +2961,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.16' class='hiddenRow bg-success'>
+        <tr id='pt32.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2895,7 +2970,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.17' class='hiddenRow bg-success'>
+        <tr id='pt32.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2904,7 +2979,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.18' class='hiddenRow bg-success'>
+        <tr id='pt32.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2913,7 +2988,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.19' class='hiddenRow bg-success'>
+        <tr id='pt32.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2922,7 +2997,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.20' class='hiddenRow bg-success'>
+        <tr id='pt32.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2931,7 +3006,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.21' class='hiddenRow bg-success'>
+        <tr id='pt32.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2940,7 +3015,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.22' class='hiddenRow bg-success'>
+        <tr id='pt32.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2949,7 +3024,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt31.23' class='hiddenRow bg-success'>
+        <tr id='pt32.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2967,13 +3042,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 1)">Detail</a>
+            <a onclick="showClassDetail('c33', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -2991,13 +3066,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 5)">Detail</a>
+            <a onclick="showClassDetail('c34', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3006,7 +3081,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3015,7 +3090,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3024,7 +3099,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3033,7 +3108,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3043,6 +3118,30 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestReconnect</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c35', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt35.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestRegister</td>
         <td class="text-center">8</td>
@@ -3051,13 +3150,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 8)">Detail</a>
+            <a onclick="showClassDetail('c36', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3066,7 +3165,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3075,7 +3174,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3084,7 +3183,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3093,7 +3192,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3102,7 +3201,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt36.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3111,7 +3210,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt36.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3120,7 +3219,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt36.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3138,13 +3237,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 3)">Detail</a>
+            <a onclick="showClassDetail('c37', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3153,7 +3252,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3162,7 +3261,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3174,19 +3273,28 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
 
     <tr id="su" class="skipClass">
         <td>TestShelf</td>
+        <td class="text-center">16</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</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('c36', 15)">Detail</a>
+            <a onclick="showClassDetail('c38', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestShelf - test_access_shelf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3195,7 +3303,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3204,7 +3312,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3213,7 +3321,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3222,7 +3330,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3231,7 +3339,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3240,7 +3348,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.7' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3249,7 +3357,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt38.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3258,7 +3366,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.9' class='hiddenRow bg-success'>
+        <tr id='pt38.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3267,7 +3375,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.10' class='hiddenRow bg-success'>
+        <tr id='pt38.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3276,7 +3384,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.11' class='hiddenRow bg-success'>
+        <tr id='pt38.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3285,7 +3393,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.12' class='hiddenRow bg-success'>
+        <tr id='pt38.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3294,19 +3402,19 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id="st36.13" class="none bg-warning">
+        <tr id="st38.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st36.13')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st36.13" class="popup_window test_output" style="display:none;">
+                <div id="div_st38.14" 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_st36.13').style.display='none'"><span
+                                onclick="document.getElementById('div_st38.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3320,7 +3428,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.14' class='hiddenRow bg-success'>
+        <tr id='pt38.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3329,7 +3437,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt36.15' class='hiddenRow bg-success'>
+        <tr id='pt38.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3339,21 +3447,21 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 9)">Detail</a>
+            <a onclick="showClassDetail('c39', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3362,7 +3470,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3371,7 +3479,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3380,7 +3488,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3389,37 +3497,102 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id="et39.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</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_et39.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et39.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et39.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
+    button.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id="et39.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</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_et39.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et39.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et39.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 298, in test_perform_update_stable_errors
+    self.fill_basic_config({&#39;config_updatechannel&#39;: &#39;Stable&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id="st37.7" class="none bg-warning">
+        <tr id="st39.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st37.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st39.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st37.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st39.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_st37.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st39.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3433,7 +3606,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3442,11 +3615,31 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt37.9' class='hiddenRow bg-success'>
+        <tr id="ft39.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</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_ft39.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft39.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 413, in test_update_write_protect
+    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3460,13 +3653,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 2)">Detail</a>
+            <a onclick="showClassDetail('c40', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3475,7 +3668,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3493,13 +3686,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 18)">Detail</a>
+            <a onclick="showClassDetail('c41', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3508,7 +3701,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3517,7 +3710,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3526,7 +3719,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3535,7 +3728,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3544,7 +3737,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3553,7 +3746,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3562,7 +3755,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3571,7 +3764,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3580,7 +3773,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3589,7 +3782,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3598,7 +3791,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3607,7 +3800,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3616,7 +3809,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.14' class='hiddenRow bg-success'>
+        <tr id='pt41.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3625,7 +3818,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3634,7 +3827,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3643,7 +3836,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.17' class='hiddenRow bg-success'>
+        <tr id='pt41.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3652,7 +3845,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt39.18' class='hiddenRow bg-success'>
+        <tr id='pt41.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3670,13 +3863,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 1)">Detail</a>
+            <a onclick="showClassDetail('c42', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3694,13 +3887,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 21)">Detail</a>
+            <a onclick="showClassDetail('c43', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3709,7 +3902,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3718,7 +3911,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3727,7 +3920,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3736,7 +3929,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3745,7 +3938,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3754,7 +3947,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3763,7 +3956,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3772,7 +3965,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3781,7 +3974,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3790,7 +3983,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3799,7 +3992,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3808,7 +4001,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3817,7 +4010,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3826,7 +4019,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3835,7 +4028,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3844,7 +4037,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -3853,7 +4046,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -3862,7 +4055,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.19' class='hiddenRow bg-success'>
+        <tr id='pt43.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -3871,7 +4064,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.20' class='hiddenRow bg-success'>
+        <tr id='pt43.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -3880,7 +4073,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt41.21' class='hiddenRow bg-success'>
+        <tr id='pt43.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -3898,13 +4091,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 34)">Detail</a>
+            <a onclick="showClassDetail('c44', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -3913,7 +4106,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -3922,7 +4115,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -3931,7 +4124,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -3940,7 +4133,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -3949,7 +4142,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -3958,7 +4151,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -3967,7 +4160,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -3976,7 +4169,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -3985,7 +4178,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -3994,7 +4187,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4003,7 +4196,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4012,7 +4205,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4021,7 +4214,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4030,7 +4223,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4039,7 +4232,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4048,7 +4241,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4057,7 +4250,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4066,7 +4259,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.19' class='hiddenRow bg-success'>
+        <tr id='pt44.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4075,7 +4268,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.20' class='hiddenRow bg-success'>
+        <tr id='pt44.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4084,7 +4277,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.21' class='hiddenRow bg-success'>
+        <tr id='pt44.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4093,7 +4286,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.22' class='hiddenRow bg-success'>
+        <tr id='pt44.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4102,7 +4295,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.23' class='hiddenRow bg-success'>
+        <tr id='pt44.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4111,7 +4304,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.24' class='hiddenRow bg-success'>
+        <tr id='pt44.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4120,7 +4313,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.25' class='hiddenRow bg-success'>
+        <tr id='pt44.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4129,7 +4322,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.26' class='hiddenRow bg-success'>
+        <tr id='pt44.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4138,7 +4331,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.27' class='hiddenRow bg-success'>
+        <tr id='pt44.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4147,7 +4340,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.28' class='hiddenRow bg-success'>
+        <tr id='pt44.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4156,7 +4349,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.29' class='hiddenRow bg-success'>
+        <tr id='pt44.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4165,7 +4358,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.30' class='hiddenRow bg-success'>
+        <tr id='pt44.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4174,7 +4367,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.31' class='hiddenRow bg-success'>
+        <tr id='pt44.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4183,7 +4376,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.32' class='hiddenRow bg-success'>
+        <tr id='pt44.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4192,7 +4385,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.33' class='hiddenRow bg-success'>
+        <tr id='pt44.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4201,7 +4394,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt42.34' class='hiddenRow bg-success'>
+        <tr id='pt44.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4219,13 +4412,13 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 16)">Detail</a>
+            <a onclick="showClassDetail('c45', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4234,7 +4427,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4243,7 +4436,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4252,7 +4445,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4261,7 +4454,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4270,7 +4463,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4279,7 +4472,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4288,7 +4481,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4297,7 +4490,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4306,7 +4499,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4315,7 +4508,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4324,7 +4517,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4333,7 +4526,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4342,7 +4535,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4351,7 +4544,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4360,7 +4553,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4371,10 +4564,10 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>389</td>
-        <td>381</td>
-        <td>1</td>
-        <td>0</td>
+        <td>393</td>
+        <td>380</td>
+        <td>4</td>
+        <td>2</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4635,6 +4828,12 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
+            <tr>
+              <th>beautifulsoup4</th>
+              <td>4.10.0</td>
+              <td>TestLoadMetadata</td>
+            </tr>
+          
             <tr>
               <th>google-api-python-client</th>
               <td>2.36.0</td>
@@ -4665,6 +4864,12 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
+            <tr>
+              <th>beautifulsoup4</th>
+              <td>4.10.0</td>
+              <td>TestLoadMetadataScholar</td>
+            </tr>
+          
             <tr>
               <th>scholarly</th>
               <td>1.5.1</td>
@@ -4763,7 +4968,7 @@ AssertionError: 0.05971028028146742 not less than or equal to 0.001</pre>
 </div>
 
 <script>
-    drawCircle(381, 1, 0, 7);
+    drawCircle(380, 4, 2, 7);
     showCase(5);
 </script>
 

From 3ae1b97d72ff4d74f07e156d8e4026f12808a509 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 13:44:53 +0100
Subject: [PATCH 097/220] Fix renaming title and author in the same request

---
 cps/helper.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cps/helper.py b/cps/helper.py
index 2daf8494..f6ea024f 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -398,6 +398,8 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                     log.debug(ex, exc_info=True)
                     return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                              src=old_author_path, dest=new_author_path, error=str(ex))
+        if first_author.lower() in [r.lower() for r in renamed_author]:
+            path = os.path.join(calibrepath, new_authordir, titledir)
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name)
     new_titledir = get_valid_filename(localbook.title) + " (" + str(book_id) + ")"

From 1e04b511489d3db41754d09627430cef8c5d2cd8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 15:16:42 +0100
Subject: [PATCH 098/220] Renaming of co-authors which are authors in another
 book

---
 cps/editbooks.py |  8 +++----
 cps/helper.py    | 55 ++++++++++++++++++++++++------------------------
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 20184bf9..1ca55452 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -964,8 +964,8 @@ def create_book_on_upload(modif_date, meta):
     authr = meta.author
     sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
 
-    title_dir = helper.get_valid_filename(title)
-    author_dir = helper.get_valid_filename(db_author.name)
+    title_dir = helper.get_valid_filename(title, chars=96)
+    author_dir = helper.get_valid_filename(db_author.name, chars=96)
 
     # combine path and normalize path from windows systems
     path = os.path.join(author_dir, title_dir).replace('\\', '/')
@@ -1283,8 +1283,8 @@ def merge_list_book():
         if to_book:
             for file in to_book.data:
                 to_file.append(file.format)
-            to_name = helper.get_valid_filename(to_book.title) + ' - ' + \
-                      helper.get_valid_filename(to_book.authors[0].name)
+            to_name = helper.get_valid_filename(to_book.title, chars=96) + ' - ' + \
+                      helper.get_valid_filename(to_book.authors[0].name, chars=96)
             for book_id in vals:
                 from_book = calibre_db.get_book(book_id)
                 if from_book:
diff --git a/cps/helper.py b/cps/helper.py
index f6ea024f..54d9c57c 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -220,7 +220,7 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
 
-def get_valid_filename(value, replace_whitespace=True):
+def get_valid_filename(value, replace_whitespace=True, chars=128):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
@@ -242,7 +242,7 @@ def get_valid_filename(value, replace_whitespace=True):
         value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U)
         # pipe has to be replaced with comma
         value = re.sub(r'[|]+', u',', value, flags=re.U)
-    value = value[:128].strip()
+    value = value[:chars].strip()
     if not value:
         raise ValueError("Filename cannot be empty")
     return value
@@ -332,7 +332,7 @@ def delete_book_file(book, calibrepath, book_format=None):
 
 
 def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=None):
-    valid_filename_authors = [get_valid_filename(r) for r in renamed_author]
+    valid_filename_authors = [get_valid_filename(r, chars=96) for r in renamed_author]
     for r in renamed_author:
         if local_book:
             all_books = [local_book]
@@ -343,10 +343,11 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
             book_author_path = book.path.split('/')[0]
             if book_author_path in valid_filename_authors or local_book:
                 new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-                all_new_authordir = get_valid_filename(new_author.name)
+                all_new_authordir = get_valid_filename(new_author.name, chars=96)
                 all_titledir = book.path.split('/')[1]
                 all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
-                all_new_name = get_valid_filename(book.title) + ' - ' + all_new_authordir
+                all_new_name = get_valid_filename(book.title, chars=42) + ' - ' \
+                               + get_valid_filename(new_author.name, chars=42)
                 # change location in database to new author/title path
                 book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
                 for file_format in book.data:
@@ -383,11 +384,11 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
     # Create new_authordir from parameter or from database
     # Create new titledir from database and add id
     if first_author:
-        new_authordir = get_valid_filename(first_author)
+        new_authordir = get_valid_filename(first_author, chars=96)
         for r in renamed_author:
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r)
-            new_author_rename_dir = get_valid_filename(new_author.name)
+            old_author_dir = get_valid_filename(r, chars=96)
+            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
                 try:
                     old_author_path = os.path.join(calibrepath, old_author_dir)
@@ -401,12 +402,12 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         if first_author.lower() in [r.lower() for r in renamed_author]:
             path = os.path.join(calibrepath, new_authordir, titledir)
     else:
-        new_authordir = get_valid_filename(localbook.authors[0].name)
-    new_titledir = get_valid_filename(localbook.title) + " (" + str(book_id) + ")"
+        new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
+    new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
 
     if titledir != new_titledir or authordir != new_authordir or orignal_filepath:
         new_path = os.path.join(calibrepath, new_authordir, new_titledir)
-        new_name = get_valid_filename(localbook.title) + ' - ' + new_authordir
+        new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
         try:
             if orignal_filepath:
                 if not os.path.isdir(new_path):
@@ -434,17 +435,17 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
             return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                      src=path, dest=new_path, error=str(ex))
 
-        # Rename all files from old names to new names
-        try:
-            clean_author_database(renamed_author, calibrepath)
-            if first_author and first_author not in renamed_author:
-                clean_author_database([first_author], calibrepath, localbook)
-            if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
-                shutil.rmtree(os.path.dirname(path))
-        except (OSError, FileNotFoundError) as ex:
-            log.error("Error in rename file in path %s", ex)
-            log.debug(ex, exc_info=True)
-            return _("Error in rename file in path: %(error)s", error=str(ex))
+    # Rename all files from old names to new names
+    try:
+        clean_author_database(renamed_author, calibrepath)
+        if first_author and first_author not in renamed_author:
+            clean_author_database([first_author], calibrepath, localbook)
+        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+            shutil.rmtree(os.path.dirname(path))
+    except (OSError, FileNotFoundError) as ex:
+        log.error("Error in rename file in path %s", ex)
+        log.debug(ex, exc_info=True)
+        return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
@@ -453,22 +454,22 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
 
     authordir = book.path.split('/')[0]
     if first_author:
-        new_authordir = get_valid_filename(first_author)
+        new_authordir = get_valid_filename(first_author, chars=96)
         for r in renamed_author:
             # Todo: Rename all authors on gdrive
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r)
-            new_author_rename_dir = get_valid_filename(new_author.name)
+            old_author_dir = get_valid_filename(r, chars=96)
+            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
             if gFile:
                 gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
             else:
                 error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
-        new_authordir = get_valid_filename(book.authors[0].name)
+        new_authordir = get_valid_filename(book.authors[0].name, chars=96)
 
     titledir = book.path.split('/')[1]
-    new_titledir = get_valid_filename(book.title) + u" (" + str(book_id) + u")"
+    new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
 
     if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)

From 111ab121b1be8a8710ca36a89ddceb1d32e526d4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 30 Jan 2022 21:27:06 +0100
Subject: [PATCH 099/220] Bugfix upload file with existing author

---
 cps/helper.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 54d9c57c..c9462ca7 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -400,7 +400,8 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                     return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                              src=old_author_path, dest=new_author_path, error=str(ex))
         if first_author.lower() in [r.lower() for r in renamed_author]:
-            path = os.path.join(calibrepath, new_authordir, titledir)
+            if os.path.isdir(os.path.join(calibrepath, new_authordir)):
+                path = os.path.join(calibrepath, new_authordir, titledir)
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
     new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
@@ -412,8 +413,8 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
             if orignal_filepath:
                 if not os.path.isdir(new_path):
                     os.makedirs(new_path)
-                shutil.move(os.path.normcase(path), os.path.normcase(os.path.join(new_path, db_filename)))
-                log.debug("Moving title: %s to %s/%s", path, new_path, new_name)
+                shutil.move(os.path.normcase(orignal_filepath), os.path.normcase(os.path.join(new_path, db_filename)))
+                log.debug("Moving title: %s to %s/%s", orignal_filepath, new_path, new_name)
             else:
                 # Check new path is not valid path
                 if not os.path.exists(new_path):

From 4dcc44803c89d71fcf34b575cc6794c45c228a5c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 31 Jan 2022 18:03:28 +0100
Subject: [PATCH 100/220] Update teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 238 ++++++++++--------------
 1 file changed, 98 insertions(+), 140 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 0004c7a0..aa032162 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-29 21:23:00</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-30 21:26:41</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>2022-01-30 01:22:23</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-01-31 01:29:29</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>3h 18 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 21 min</p>
         </div>
       </div>
       </div>
@@ -420,11 +420,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -470,33 +470,11 @@
     
     
     
-        <tr id="ft6.5" class="none bg-danger">
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 357, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1306,13 +1284,13 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
 
     <tr id="su" class="passClass">
         <td>TestEditAuthors</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</td>
+        <td class="text-center">6</td>
+        <td class="text-center">6</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('c12', 1)">Detail</a>
+            <a onclick="showClassDetail('c12', 6)">Detail</a>
         </td>
     </tr>
 
@@ -1320,7 +1298,52 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
         <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1529,11 +1552,11 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</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">
@@ -1714,11 +1737,31 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt15.20' class='hiddenRow bg-success'>
+        <tr id="ft15.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</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_ft15.20')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=0ec12ad1-d1a5-4308-8d9b-da739ee472a2&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1757,7 +1800,7 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
     self.assertEqual(30, len(results))
-AssertionError: 30 != 0</pre>
+AssertionError: 30 != 35</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3447,12 +3490,12 @@ AssertionError: 1 != 0 : []</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</td>
+        <td class="text-center">8</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('c39', 9)">Detail</a>
@@ -3497,85 +3540,20 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="et39.5" class="none bg-info">
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
-    button.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et39.6" class="none bg-info">
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et39.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et39.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et39.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 298, in test_perform_update_stable_errors
-    self.fill_basic_config({&#39;config_updatechannel&#39;: &#39;Stable&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3615,31 +3593,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft39.9" class="none bg-danger">
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft39.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft39.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft39.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 413, in test_update_write_protect
-    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
-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>
     
     
@@ -4564,10 +4522,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>393</td>
-        <td>380</td>
-        <td>4</td>
-        <td>2</td>
+        <td>398</td>
+        <td>388</td>
+        <td>3</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4968,7 +4926,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(380, 4, 2, 7);
+    drawCircle(388, 3, 0, 7);
     showCase(5);
 </script>
 

From 23e47ba4e60e692f6daad8a4616c29e625b895fa Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 31 Jan 2022 18:09:23 +0100
Subject: [PATCH 101/220] Fix for #2299 (scholarly requires Internet connection
 at startup)

---
 cps/about.py                     | 6 +++++-
 cps/editbooks.py                 | 7 -------
 cps/metadata_provider/scholar.py | 9 ++++++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 7e839520..54f0eb91 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -58,10 +58,14 @@ try:
 except ImportError:
     greenlet_Version = None
 
+try:
+    from fake_useragent.errors import FakeUserAgentError
+except (ImportError):
+    FakeUserAgentError = BaseException
 try:
     from scholarly import scholarly
     scholarly_version = _(u'installed')
-except ImportError:
+except (ImportError, FakeUserAgentError):
     scholarly_version = _(u'not installed')
 
 from . import services
diff --git a/cps/editbooks.py b/cps/editbooks.py
index f0b8fb41..2f3b1b88 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -33,13 +33,6 @@ try:
 except ImportError:
     pass
 
-# Improve this to check if scholarly is available in a global way, like other pythonic libraries
-try:
-    from scholarly import scholarly
-    have_scholar = True
-except ImportError:
-    have_scholar = False
-
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index df387831..2a8d3cca 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -16,7 +16,14 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from scholarly import scholarly
+try:
+    from fake_useragent.errors import FakeUserAgentError
+except (ImportError):
+    FakeUserAgentError = BaseException
+try:
+    from scholarly import scholarly
+except FakeUserAgentError:
+    raise ImportError("No module named 'scholarly'")
 
 from cps.services.Metadata import Metadata
 

From 95e0255aa1da646c50d863a6bb450ca6f06a96b0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 31 Jan 2022 19:19:25 +0100
Subject: [PATCH 102/220] Code cosmetics, removed scholarly from about section

---
 cps/about.py | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 54f0eb91..7ff178e3 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -25,8 +25,15 @@ import platform
 import sqlite3
 from collections import OrderedDict
 
-import babel, pytz, requests, sqlalchemy
-import werkzeug, flask, flask_login, flask_principal, jinja2
+import babel
+import pytz
+import requests
+import sqlalchemy
+import werkzeug
+import flask
+import flask_login
+import flask_principal
+import jinja2
 from flask_babel import gettext as _
 try:
     from flask_wtf import __version__ as flaskwtf_version
@@ -58,16 +65,6 @@ try:
 except ImportError:
     greenlet_Version = None
 
-try:
-    from fake_useragent.errors import FakeUserAgentError
-except (ImportError):
-    FakeUserAgentError = BaseException
-try:
-    from scholarly import scholarly
-    scholarly_version = _(u'installed')
-except (ImportError, FakeUserAgentError):
-    scholarly_version = _(u'not installed')
-
 from . import services
 
 about = flask.Blueprint('about', __name__)
@@ -82,8 +79,8 @@ if constants.NIGHTLY_VERSION[0] == "$Format:%H$":
     calibre_web_version = constants.STABLE_VERSION['version']
 else:
     calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
-                    + constants.NIGHTLY_VERSION[0].replace('%','%%') + ' - '
-                    + constants.NIGHTLY_VERSION[1].replace('%','%%'))
+                           + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
+                           + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
 if getattr(sys, 'frozen', False):
     calibre_web_version += " - Exe-Version"
 elif constants.HOME_CONFIG:
@@ -91,7 +88,7 @@ elif constants.HOME_CONFIG:
 
 if not ret:
     _VERSIONS = OrderedDict(
-        Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
+        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
         Python=sys.version,
         Calibre_Web=calibre_web_version,
         WebServer=server.VERSION,
@@ -109,7 +106,6 @@ if not ret:
         iso639=isoLanguages.__version__,
         pytz=pytz.__version__,
         Unidecode=unidecode_version,
-        Scholarly=scholarly_version,
         Flask_SimpleLDAP=u'installed' if bool(services.ldap) else None,
         python_LDAP=services.ldapVersion if bool(services.ldapVersion) else None,
         Goodreads=u'installed' if bool(services.goodreads_support) else None,
@@ -121,23 +117,25 @@ if not ret:
     _VERSIONS.update(uploader.get_versions(True))
 else:
     _VERSIONS = OrderedDict(
-        Platform = '{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
-        Python = sys.version,
+        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
+        Python=sys.version,
         Calibre_Web=calibre_web_version,
-        Werkzeug = werkzeug.__version__,
+        Werkzeug=werkzeug.__version__,
         Jinja2=jinja2.__version__,
-        pySqlite = sqlite3.version,
-        SQLite = sqlite3.sqlite_version,
+        pySqlite=sqlite3.version,
+        SQLite=sqlite3.sqlite_version,
     )
     _VERSIONS.update(ret)
     _VERSIONS.update(uploader.get_versions(False))
 
+
 def collect_stats():
     _VERSIONS['ebook converter'] = _(converter.get_calibre_version())
     _VERSIONS['unrar'] = _(converter.get_unrar_version())
     _VERSIONS['kepubify'] = _(converter.get_kepubify_version())
     return _VERSIONS
 
+
 @about.route("/stats")
 @flask_login.login_required
 def stats():

From 0bc15636f2c0195ed1238d5af1ed47dc6f95647b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 1 Feb 2022 20:08:42 +0100
Subject: [PATCH 103/220] Bugfixes for renaming authors on gdrive

---
 cps/editbooks.py                        |   2 +-
 cps/helper.py                           |   5 +-
 test/Calibre-Web TestSummary_Linux.html | 925 +++++++++++++-----------
 3 files changed, 516 insertions(+), 416 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 41df5a2e..21561766 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1066,7 +1066,7 @@ def upload():
 
                 book_id = db_book.id
                 title = db_book.title
-
+                # ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive
                 error = helper.update_dir_structure_file(book_id,
                                                    config.config_calibre_dir,
                                                    input_authors[0],
diff --git a/cps/helper.py b/cps/helper.py
index c9462ca7..26cca79c 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -464,8 +464,9 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
             if gFile:
                 gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
-            else:
-                error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+            # author is always co-author and has is never author, no folder is okay
+            #else:
+            #    error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
         new_authordir = get_valid_filename(book.authors[0].name, chars=96)
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index aa032162..742ae9fb 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-30 21:26:41</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-01-31 21:25:49</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>2022-01-31 01:29:29</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-01 01:40:44</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>3h 21 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 28 min</p>
         </div>
       </div>
       </div>
@@ -1351,32 +1351,52 @@
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestEditBooksList</td>
-        <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+    <tr id="su" class="failClass">
+        <td>TestEditAuthorsGdrive</td>
+        <td class="text-center">6</td>
+        <td class="text-center">2</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 18)">Detail</a>
+            <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id="ft13.1" class="none bg-danger">
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 294, in test_change_capital_co_author
+    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;f777605d-a838-445b-bae2-e6d59822f1fa&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
         <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1384,6 +1404,115 @@
     
     
         <tr id='pt13.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.4" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 346, in test_change_capital_rename_co_author
+    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;4fcb7fb8-c3e4-4e04-8fb3-6d99d9999b74&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.5" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 461, in test_change_capital_rename_two_co_authors
+    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;e4d4c44d-e87d-495b-abc6-f8a5100f2098&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='st13.6' class='none bg-warning'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditBooksList</td>
+        <td class="text-center">18</td>
+        <td class="text-center">18</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('c14', 18)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1392,7 +1521,7 @@
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1401,7 +1530,7 @@
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1410,7 +1539,7 @@
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1419,7 +1548,7 @@
     
     
     
-        <tr id='pt13.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1428,7 +1557,7 @@
     
     
     
-        <tr id='pt13.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1437,7 +1566,7 @@
     
     
     
-        <tr id='pt13.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1446,7 +1575,7 @@
     
     
     
-        <tr id='pt13.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1455,7 +1584,7 @@
     
     
     
-        <tr id='pt13.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1464,7 +1593,7 @@
     
     
     
-        <tr id='pt13.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1473,7 +1602,7 @@
     
     
     
-        <tr id='pt13.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1482,7 +1611,7 @@
     
     
     
-        <tr id='pt13.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1491,7 +1620,7 @@
     
     
     
-        <tr id='pt13.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1500,7 +1629,7 @@
     
     
     
-        <tr id='pt13.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1509,7 +1638,7 @@
     
     
     
-        <tr id='pt13.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1518,7 +1647,7 @@
     
     
     
-        <tr id='pt13.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1536,13 +1665,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -1552,21 +1681,21 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</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('c15', 20)">Detail</a>
+            <a onclick="showClassDetail('c16', 20)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1575,7 +1704,7 @@
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1584,7 +1713,7 @@
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1593,7 +1722,7 @@
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1602,7 +1731,7 @@
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1611,7 +1740,7 @@
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1620,7 +1749,7 @@
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1629,7 +1758,7 @@
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1638,7 +1767,7 @@
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1647,7 +1776,7 @@
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1656,7 +1785,7 @@
     
     
     
-        <tr id='pt15.11' class='hiddenRow bg-success'>
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1665,7 +1794,7 @@
     
     
     
-        <tr id='pt15.12' class='hiddenRow bg-success'>
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1674,7 +1803,7 @@
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1683,7 +1812,7 @@
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1692,7 +1821,7 @@
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1701,7 +1830,7 @@
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1710,7 +1839,7 @@
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
@@ -1719,7 +1848,7 @@
     
     
     
-        <tr id='pt15.18' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1728,7 +1857,7 @@
     
     
     
-        <tr id='pt15.19' class='hiddenRow bg-success'>
+        <tr id='pt16.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
@@ -1737,75 +1866,35 @@
     
     
     
-        <tr id="ft15.20" class="none bg-danger">
+        <tr id='pt16.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 940, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=0ec12ad1-d1a5-4308-8d9b-da739ee472a2&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft16.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
-    self.assertEqual(30, len(results))
-AssertionError: 30 != 35</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1819,13 +1908,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1834,7 +1923,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1843,7 +1932,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1861,13 +1950,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1876,7 +1965,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1885,7 +1974,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1894,7 +1983,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1903,7 +1992,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1912,7 +2001,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1921,7 +2010,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1939,13 +2028,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1963,13 +2052,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 2)">Detail</a>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1978,7 +2067,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -1996,13 +2085,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2011,19 +2100,19 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id="st21.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st21.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st21.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.2" 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_st21.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2037,7 +2126,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt21.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2055,13 +2144,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2079,13 +2168,13 @@ AssertionError: 30 != 35</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2094,7 +2183,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2103,7 +2192,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2113,21 +2202,21 @@ AssertionError: 30 != 35</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</td>
+        <td class="text-center">11</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('c24', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2136,7 +2225,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2145,7 +2234,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2154,7 +2243,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2163,7 +2252,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2172,7 +2261,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2181,7 +2270,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2190,7 +2279,7 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id='pt24.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2199,36 +2288,16 @@ AssertionError: 30 != 35</pre>
     
     
     
-        <tr id="ft24.9" class="none bg-danger">
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft24.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft24.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft24.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 350, in test_sync_shelf
-    self.assertEqual(1, len(data), data)
-AssertionError: 1 != 0 : []</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt24.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2237,7 +2306,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt24.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2255,13 +2324,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 5)">Detail</a>
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2270,7 +2339,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2279,7 +2348,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2288,7 +2357,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2297,7 +2366,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2315,13 +2384,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2330,7 +2399,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2339,7 +2408,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2348,7 +2417,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2357,7 +2426,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2366,7 +2435,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2375,7 +2444,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2384,7 +2453,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2393,7 +2462,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2402,7 +2471,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2411,7 +2480,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2420,7 +2489,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2429,7 +2498,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt26.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2447,13 +2516,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 8)">Detail</a>
+            <a onclick="showClassDetail('c28', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2462,7 +2531,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2471,7 +2540,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2480,7 +2549,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2489,7 +2558,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2498,7 +2567,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2507,7 +2576,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2516,7 +2585,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2534,13 +2603,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2549,7 +2618,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2558,7 +2627,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2567,7 +2636,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2576,19 +2645,19 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="st28.5" class="none bg-warning">
+        <tr id="st29.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st28.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st28.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st28.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2602,7 +2671,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2611,7 +2680,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2620,7 +2689,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2629,7 +2698,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2647,13 +2716,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2662,7 +2731,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2671,7 +2740,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2680,7 +2749,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2689,7 +2758,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2698,7 +2767,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2707,7 +2776,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2716,7 +2785,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2725,7 +2794,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2734,7 +2803,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2743,7 +2812,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2752,7 +2821,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2761,7 +2830,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2770,7 +2839,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2779,7 +2848,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2797,13 +2866,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2812,7 +2881,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2830,13 +2899,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2845,7 +2914,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2863,13 +2932,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2878,7 +2947,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2887,7 +2956,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2896,7 +2965,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2905,7 +2974,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2914,7 +2983,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2923,7 +2992,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2932,7 +3001,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2941,7 +3010,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2950,7 +3019,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2959,7 +3028,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2968,7 +3037,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2977,7 +3046,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2986,7 +3055,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2995,7 +3064,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3004,7 +3073,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3013,7 +3082,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3022,7 +3091,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3031,7 +3100,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3040,7 +3109,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3049,7 +3118,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3058,7 +3127,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3067,7 +3136,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt32.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3085,13 +3154,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3109,13 +3178,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 5)">Detail</a>
+            <a onclick="showClassDetail('c35', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3124,7 +3193,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3133,7 +3202,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3142,7 +3211,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3151,7 +3220,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3169,13 +3238,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3193,13 +3262,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 8)">Detail</a>
+            <a onclick="showClassDetail('c37', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3208,7 +3277,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3217,7 +3286,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3226,7 +3295,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3235,7 +3304,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3244,7 +3313,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.6' class='hiddenRow bg-success'>
+        <tr id='pt37.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3253,7 +3322,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.7' class='hiddenRow bg-success'>
+        <tr id='pt37.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3262,7 +3331,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt36.8' class='hiddenRow bg-success'>
+        <tr id='pt37.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3280,13 +3349,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 3)">Detail</a>
+            <a onclick="showClassDetail('c38', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3295,7 +3364,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3304,7 +3373,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3322,13 +3391,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 16)">Detail</a>
+            <a onclick="showClassDetail('c39', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3337,7 +3406,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3346,7 +3415,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3355,7 +3424,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3364,7 +3433,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3373,7 +3442,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3382,7 +3451,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3391,7 +3460,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3400,7 +3469,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.9' class='hiddenRow bg-success'>
+        <tr id='pt39.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3409,7 +3478,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.10' class='hiddenRow bg-success'>
+        <tr id='pt39.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3418,7 +3487,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.11' class='hiddenRow bg-success'>
+        <tr id='pt39.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3427,7 +3496,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.12' class='hiddenRow bg-success'>
+        <tr id='pt39.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3436,7 +3505,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.13' class='hiddenRow bg-success'>
+        <tr id='pt39.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3445,19 +3514,19 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="st38.14" class="none bg-warning">
+        <tr id="st39.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st38.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st39.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st38.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st39.14" 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_st38.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st39.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3471,7 +3540,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.15' class='hiddenRow bg-success'>
+        <tr id='pt39.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3480,7 +3549,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt38.16' class='hiddenRow bg-success'>
+        <tr id='pt39.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3498,13 +3567,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 9)">Detail</a>
+            <a onclick="showClassDetail('c40', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3513,7 +3582,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3522,7 +3591,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3531,7 +3600,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3540,7 +3609,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3549,7 +3618,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3558,19 +3627,19 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id="st39.7" class="none bg-warning">
+        <tr id="st40.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st39.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st39.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.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_st39.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3584,7 +3653,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3593,7 +3662,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3611,13 +3680,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 2)">Detail</a>
+            <a onclick="showClassDetail('c41', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3626,7 +3695,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3644,13 +3713,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 18)">Detail</a>
+            <a onclick="showClassDetail('c42', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3659,7 +3728,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3668,7 +3737,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3677,7 +3746,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3686,7 +3755,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3695,7 +3764,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3704,7 +3773,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3713,7 +3782,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3722,7 +3791,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3731,7 +3800,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3740,7 +3809,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3749,7 +3818,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3758,7 +3827,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3767,7 +3836,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.14' class='hiddenRow bg-success'>
+        <tr id='pt42.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3776,7 +3845,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3785,7 +3854,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3794,7 +3863,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.17' class='hiddenRow bg-success'>
+        <tr id='pt42.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3803,7 +3872,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt41.18' class='hiddenRow bg-success'>
+        <tr id='pt42.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3821,13 +3890,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 1)">Detail</a>
+            <a onclick="showClassDetail('c43', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3845,13 +3914,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 21)">Detail</a>
+            <a onclick="showClassDetail('c44', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3860,7 +3929,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3869,7 +3938,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3878,7 +3947,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3887,7 +3956,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3896,7 +3965,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3905,7 +3974,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3914,7 +3983,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3923,7 +3992,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3932,7 +4001,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3941,7 +4010,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3950,7 +4019,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3959,7 +4028,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -3968,7 +4037,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -3977,7 +4046,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -3986,7 +4055,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -3995,7 +4064,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4004,7 +4073,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4013,7 +4082,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.19' class='hiddenRow bg-success'>
+        <tr id='pt44.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4022,7 +4091,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.20' class='hiddenRow bg-success'>
+        <tr id='pt44.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4031,7 +4100,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt43.21' class='hiddenRow bg-success'>
+        <tr id='pt44.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4049,13 +4118,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 34)">Detail</a>
+            <a onclick="showClassDetail('c45', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4064,7 +4133,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4073,7 +4142,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4082,7 +4151,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4091,7 +4160,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4100,7 +4169,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4109,7 +4178,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4118,7 +4187,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4127,7 +4196,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4136,7 +4205,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4145,7 +4214,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4154,7 +4223,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4163,7 +4232,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4172,7 +4241,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4181,7 +4250,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4190,7 +4259,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4199,7 +4268,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4208,7 +4277,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4217,7 +4286,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4226,7 +4295,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4235,7 +4304,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4244,7 +4313,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.22' class='hiddenRow bg-success'>
+        <tr id='pt45.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4253,7 +4322,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.23' class='hiddenRow bg-success'>
+        <tr id='pt45.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4262,7 +4331,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.24' class='hiddenRow bg-success'>
+        <tr id='pt45.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4271,7 +4340,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.25' class='hiddenRow bg-success'>
+        <tr id='pt45.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4280,7 +4349,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.26' class='hiddenRow bg-success'>
+        <tr id='pt45.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4289,7 +4358,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.27' class='hiddenRow bg-success'>
+        <tr id='pt45.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4298,7 +4367,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.28' class='hiddenRow bg-success'>
+        <tr id='pt45.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4307,7 +4376,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.29' class='hiddenRow bg-success'>
+        <tr id='pt45.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4316,7 +4385,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.30' class='hiddenRow bg-success'>
+        <tr id='pt45.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4325,7 +4394,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.31' class='hiddenRow bg-success'>
+        <tr id='pt45.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4334,7 +4403,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.32' class='hiddenRow bg-success'>
+        <tr id='pt45.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4343,7 +4412,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.33' class='hiddenRow bg-success'>
+        <tr id='pt45.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4352,7 +4421,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt44.34' class='hiddenRow bg-success'>
+        <tr id='pt45.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4370,13 +4439,13 @@ AssertionError: 1 != 0 : []</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 16)">Detail</a>
+            <a onclick="showClassDetail('c46', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4385,7 +4454,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4394,7 +4463,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4403,7 +4472,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4412,7 +4481,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4421,7 +4490,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4430,7 +4499,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4439,7 +4508,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4448,7 +4517,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4457,7 +4526,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4466,7 +4535,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4475,7 +4544,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4484,7 +4553,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4493,7 +4562,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4502,7 +4571,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4511,7 +4580,7 @@ AssertionError: 1 != 0 : []</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4522,11 +4591,11 @@ AssertionError: 1 != 0 : []</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>398</td>
-        <td>388</td>
+        <td>404</td>
+        <td>393</td>
         <td>3</td>
         <td>0</td>
-        <td>7</td>
+        <td>8</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4786,6 +4855,36 @@ AssertionError: 1 != 0 : []</pre>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
+            <tr>
+              <th>google-api-python-client</th>
+              <td>2.36.0</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>httplib2</th>
+              <td>0.20.2</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>oauth2client</th>
+              <td>4.1.3</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyDrive2</th>
+              <td>1.10.0</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
+            <tr>
+              <th>PyYAML</th>
+              <td>6.0</td>
+              <td>TestEditAuthorsGdrive</td>
+            </tr>
+          
             <tr>
               <th>beautifulsoup4</th>
               <td>4.10.0</td>
@@ -4926,7 +5025,7 @@ AssertionError: 1 != 0 : []</pre>
 </div>
 
 <script>
-    drawCircle(388, 3, 0, 7);
+    drawCircle(393, 3, 0, 8);
     showCase(5);
 </script>
 

From e0bf829def15ecd0e9f549e89ae0c0457b5852e4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 1 Feb 2022 20:19:14 +0100
Subject: [PATCH 104/220] Bugfix parsing /Keywords' in doc_info of pdf file
 with type bytes (fixes #2302)

---
 cps/uploader.py           | 5 ++++-
 optional-requirements.txt | 2 +-
 setup.cfg                 | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cps/uploader.py b/cps/uploader.py
index f238b89d..992d188c 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -233,7 +233,10 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         if subject == '':
             subject = doc_info.subject
         if tags == '' and '/Keywords' in doc_info:
-            tags = doc_info['/Keywords']
+            if isinstance(doc_info['/Keywords'], bytes):
+                tags = doc_info['/Keywords'].decode('utf-8')
+            else:
+                tags = doc_info['/Keywords']
     else:
         title = original_file_name
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2ebcf1a7..f894fcc1 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -33,7 +33,7 @@ rarfile>=2.7
 scholarly>=1.2.0,<1.6
 
 # Comics
-natsort>=2.2.0,<8.1.0
+natsort>=2.2.0,<8.2.0
 comicapi>=2.2.0,<2.3.0
 
 # Kobo integration
diff --git a/setup.cfg b/setup.cfg
index db2fd3e6..d17642dd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -87,7 +87,7 @@ metadata =
 	rarfile>=2.7
 	scholarly>=1.2.0,<1.6
 comics = 
-	natsort>=2.2.0,<8.1.0
+	natsort>=2.2.0,<8.2.0
 	comicapi>=2.2.0,<2.3.0
 kobo = 
 	jsonschema>=3.2.0,<4.5.0

From 1ce45f325397cf0cdc2bd6206e4bd7c15e481968 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 2 Feb 2022 17:42:48 +0100
Subject: [PATCH 105/220] Update teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 128 ++++++++++--------------
 1 file changed, 54 insertions(+), 74 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 742ae9fb..bd12238c 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-01-31 21:25:49</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-01 20:32:05</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>2022-02-01 01:40:44</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-02 00:57:41</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>3h 28 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 39 min</p>
         </div>
       </div>
       </div>
@@ -1354,10 +1354,10 @@
     <tr id="su" class="failClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">2</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
         <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
@@ -1365,31 +1365,11 @@
 
     
     
-        <tr id="ft13.1" class="none bg-danger">
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 294, in test_change_capital_co_author
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;f777605d-a838-445b-bae2-e6d59822f1fa&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1412,55 +1392,44 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
     
     
-        <tr id="ft13.4" class="none bg-danger">
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 346, in test_change_capital_rename_co_author
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;4fcb7fb8-c3e4-4e04-8fb3-6d99d9999b74&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft13.5" class="none bg-danger">
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.6" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft13.5" class="popup_window test_output" style="display:block;">
+                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft13.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 461, in test_change_capital_rename_two_co_authors
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 562, in test_rename_capital_on_upload
     self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;d92f8f6d-6918-4c96-a00d-13ae877191d1&#34;, element=&#34;e4d4c44d-e87d-495b-abc6-f8a5100f2098&#34;)&gt; is not false</pre>
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;34a2afba-2e3f-4f75-bc09-67899f2ccfba&#34;, element=&#34;08372364-79c8-4996-97da-de74437e794d&#34;)&gt; is not false</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1469,15 +1438,6 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
         </tr>
     
     
-    
-        <tr id='st13.6' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
-            </td>
-            <td colspan='6' align='center'>SKIP</td>
-        </tr>
-    
-    
 
 
     <tr id="su" class="passClass">
@@ -1657,11 +1617,11 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1671,11 +1631,31 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="ft15.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</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_ft15.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4592,10 +4572,10 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>393</td>
-        <td>3</td>
+        <td>395</td>
+        <td>2</td>
         <td>0</td>
-        <td>8</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4623,7 +4603,7 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-27-generic #29~20.04.1-Ubuntu SMP Fri Jan 14 00:32:30 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-28-generic #31~20.04.1-Ubuntu SMP Wed Jan 19 14:08:10 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -5025,7 +5005,7 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 </div>
 
 <script>
-    drawCircle(393, 3, 0, 8);
+    drawCircle(395, 2, 0, 7);
     showCase(5);
 </script>
 

From 26a8ac1425e6c892f7686589e29bb4142c0338da Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 09:06:14 +0100
Subject: [PATCH 106/220] Mass rename author before last stage

---
 cps/editbooks.py          |  24 ++++---
 cps/gdriveutils.py        |  46 +++----------
 cps/helper.py             | 136 +++++++++++++++++++++-----------------
 optional-requirements.txt |   2 +-
 4 files changed, 103 insertions(+), 105 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 21561766..16e29535 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -82,7 +82,6 @@ def search_objects_remove(db_book_object, db_type, input_elements):
             type_elements = c_elements.name
         for inp_element in input_elements:
             if inp_element.lower() == type_elements.lower():
-                # if inp_element == type_elements:
                 found = True
                 break
         # if the element was not found in the new list, add it to remove list
@@ -132,7 +131,6 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
         # check if a element with that name exists
         db_element = db_session.query(db_object).filter(db_filter == add_element).first()
         # if no element is found add it
-        # if new_element is None:
         if db_type == 'author':
             new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "")
         elif db_type == 'series':
@@ -1067,12 +1065,22 @@ def upload():
                 book_id = db_book.id
                 title = db_book.title
                 # ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive
-                error = helper.update_dir_structure_file(book_id,
-                                                   config.config_calibre_dir,
-                                                   input_authors[0],
-                                                   meta.file_path,
-                                                   title_dir + meta.extension.lower(),
-                                                   renamed_author=renamed_authors)
+                if config.config_use_google_drive:
+                    file_name = helper.get_valid_filename(title, chars=42) + \
+                                ' - ' + helper.get_valid_filename(input_authors[0], chars=42) +\
+                                meta.extension.lower()
+
+                    gdrive_path = os.path.join(helper.get_valid_filename(input_authors[0], chars=96),
+                                               title_dir + " (" + str(book_id) + ")",
+                                               file_name)
+                    gdriveutils.uploadFileToEbooksFolder(gdrive_path.replace("\\", "/"), meta.file_path)
+                else:
+                    error = helper.update_dir_structure(book_id,
+                                                        config.config_calibre_dir,
+                                                        input_authors[0],
+                                                        meta.file_path,
+                                                        title_dir + meta.extension.lower(),
+                                                        renamed_author=renamed_authors)
 
                 move_coverfile(meta, db_book)
 
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index de3fbb64..eae175a0 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -35,10 +35,10 @@ except ImportError:
 from sqlalchemy.exc import OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import text
 
-try:
-    from six import __version__ as six_version
-except ImportError:
-    six_version = "not installed"
+#try:
+#    from six import __version__ as six_version
+#except ImportError:
+#    six_version = "not installed"
 try:
     from httplib2 import __version__ as httplib2_version
 except ImportError:
@@ -355,30 +355,6 @@ def downloadFile(path, filename, output):
     f = getFileFromEbooksFolder(path, filename)
     f.GetContentFile(output)
 
-'''def renameGdriveFolderRemote(origin_file, target_folder):
-    drive = getDrive(Gdrive.Instance().drive)
-    previous_parents = ",".join([parent["id"] for parent in origin_file.get('parents')])
-    children = drive.auth.service.children().list(folderId=previous_parents).execute()
-    gFileTargetDir = getFileFromEbooksFolder(None, target_folder)
-    if not gFileTargetDir or gFileTargetDir['title'] != target_folder:
-        # Folder is not existing, rename folder
-        drive.auth.service.files().patch(fileId=origin_file['id'],
-                                         body={'title': target_folder},
-                                         fields='title').execute()
-        # gFileTargetDir = drive.CreateFile(
-        #    {'title': target_folder, 'parents': [{"kind": "drive#fileLink", 'id': getEbooksFolderId()}],
-        #     "mimeType": "application/vnd.google-apps.folder"})
-        # gFileTargetDir.Upload()
-    else:
-        # Move the file to the new folder
-        drive.auth.service.files().update(fileId=origin_file['id'],
-                                          addParents=gFileTargetDir['id'],
-                                          removeParents=previous_parents,
-                                          fields='id, parents').execute()
-    # if previous_parents has no children anymore, delete original fileparent
-    if len(children['items']) == 1:
-        deleteDatabaseEntry(previous_parents)
-        drive.auth.service.files().delete(fileId=previous_parents).execute()'''
 
 def moveGdriveFolderRemote(origin_file, target_folder):
     drive = getDrive(Gdrive.Instance().drive)
@@ -454,24 +430,24 @@ def uploadFileToEbooksFolder(destFile, f):
     splitDir = destFile.split('/')
     for i, x in enumerate(splitDir):
         if i == len(splitDir)-1:
-            existingFiles = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
+            existing_Files = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
                                                  (x.replace("'", r"\'"), parent['id'])}).GetList()
-            if len(existingFiles) > 0:
-                driveFile = existingFiles[0]
+            if len(existing_Files) > 0:
+                driveFile = existing_Files[0]
             else:
                 driveFile = drive.CreateFile({'title': x,
                                               'parents': [{"kind": "drive#fileLink", 'id': parent['id']}], })
             driveFile.SetContentFile(f)
             driveFile.Upload()
         else:
-            existingFolder = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
+            existing_Folder = drive.ListFile({'q': "title = '%s' and '%s' in parents and trashed = false" %
                                                   (x.replace("'", r"\'"), parent['id'])}).GetList()
-            if len(existingFolder) == 0:
+            if len(existing_Folder) == 0:
                 parent = drive.CreateFile({'title': x, 'parents': [{"kind": "drive#fileLink", 'id': parent['id']}],
                     "mimeType": "application/vnd.google-apps.folder"})
                 parent.Upload()
             else:
-                parent = existingFolder[0]
+                parent = existing_Folder[0]
 
 
 def watchChange(drive, channel_id, channel_type, channel_address,
@@ -713,5 +689,5 @@ def get_error_text(client_secrets=None):
 
 
 def get_versions():
-    return {'six': six_version,
+    return { # 'six': six_version,
             'httplib2': httplib2_version}
diff --git a/cps/helper.py b/cps/helper.py
index 26cca79c..ac538665 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -369,13 +369,13 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
 
 
 # Moves files in file storage during author/title rename, or from temp dir to file storage
-def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepath, db_filename, renamed_author):
+def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
     localbook = calibre_db.get_book(book_id)
-    if orignal_filepath:
-        path = orignal_filepath
+    if original_filepath:
+        path = original_filepath
     else:
-        path = os.path.join(calibrepath, localbook.path)
+        path = os.path.join(calibre_path, localbook.path)
 
     # Create (current) authordir and titledir from database
     authordir = localbook.path.split('/')[0]
@@ -389,10 +389,10 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r, chars=96)
             new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
-            if os.path.isdir(os.path.join(calibrepath, old_author_dir)):
+            if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
                 try:
-                    old_author_path = os.path.join(calibrepath, old_author_dir)
-                    new_author_path = os.path.join(calibrepath, new_author_rename_dir)
+                    old_author_path = os.path.join(calibre_path, old_author_dir)
+                    new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                     shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
                 except (OSError) as ex:
                     log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
@@ -400,48 +400,72 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
                     return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                              src=old_author_path, dest=new_author_path, error=str(ex))
         if first_author.lower() in [r.lower() for r in renamed_author]:
-            if os.path.isdir(os.path.join(calibrepath, new_authordir)):
-                path = os.path.join(calibrepath, new_authordir, titledir)
+            if os.path.isdir(os.path.join(calibre_path, new_authordir)):
+                path = os.path.join(calibre_path, new_authordir, titledir)
     else:
         new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
     new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
 
-    if titledir != new_titledir or authordir != new_authordir or orignal_filepath:
-        new_path = os.path.join(calibrepath, new_authordir, new_titledir)
-        new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
-        try:
-            if orignal_filepath:
-                if not os.path.isdir(new_path):
-                    os.makedirs(new_path)
-                shutil.move(os.path.normcase(orignal_filepath), os.path.normcase(os.path.join(new_path, db_filename)))
-                log.debug("Moving title: %s to %s/%s", orignal_filepath, new_path, new_name)
-            else:
-                # Check new path is not valid path
-                if not os.path.exists(new_path):
-                    # move original path to new path
-                    log.debug("Moving title: %s to %s", path, new_path)
-                    shutil.move(os.path.normcase(path), os.path.normcase(new_path))
-                else: # path is valid copy only files to new location (merge)
-                    log.info("Moving title: %s into existing: %s", path, new_path)
-                    # Take all files and subfolder from old path (strange command)
-                    for dir_name, __, file_list in os.walk(path):
-                        for file in file_list:
-                            shutil.move(os.path.normcase(os.path.join(dir_name, file)),
-                                            os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
-            # change location in database to new author/title path
-            localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/')
-        except (OSError) as ex:
-            log.error("Rename title from: %s to %s: %s", path, new_path, ex)
-            log.debug(ex, exc_info=True)
-            return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
-                     src=path, dest=new_path, error=str(ex))
+    if titledir != new_titledir or authordir != new_authordir or original_filepath:
+        error = move_files_on_change(calibre_path,
+                                     new_authordir,
+                                     new_titledir,
+                                     localbook,
+                                     db_filename,
+                                     original_filepath,
+                                     path)
+        if error:
+            return error
 
     # Rename all files from old names to new names
+    return rename_files_on_change(first_author, renamed_author, localbook, original_filepath, path, calibre_path)
+
+
+def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, db_filename, original_filepath, path):
+    new_path = os.path.join(calibre_path, new_authordir, new_titledir)
+    new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
     try:
-        clean_author_database(renamed_author, calibrepath)
+        if original_filepath:
+            if not os.path.isdir(new_path):
+                os.makedirs(new_path)
+            shutil.move(os.path.normcase(original_filepath), os.path.normcase(os.path.join(new_path, db_filename)))
+            log.debug("Moving title: %s to %s/%s", original_filepath, new_path, new_name)
+        else:
+            # Check new path is not valid path
+            if not os.path.exists(new_path):
+                # move original path to new path
+                log.debug("Moving title: %s to %s", path, new_path)
+                shutil.move(os.path.normcase(path), os.path.normcase(new_path))
+            else: # path is valid copy only files to new location (merge)
+                log.info("Moving title: %s into existing: %s", path, new_path)
+                # Take all files and subfolder from old path (strange command)
+                for dir_name, __, file_list in os.walk(path):
+                    for file in file_list:
+                        shutil.move(os.path.normcase(os.path.join(dir_name, file)),
+                                        os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
+        # change location in database to new author/title path
+        localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/')
+    except OSError as ex:
+        log.error("Rename title from: %s to %s: %s", path, new_path, ex)
+        log.debug(ex, exc_info=True)
+        return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
+                 src=path, dest=new_path, error=str(ex))
+    return False
+
+
+def rename_files_on_change(first_author,
+                           renamed_author,
+                           localbook,
+                           orignal_filepath="",
+                           path="",
+                           calibre_path="",
+                           gdrive=False):
+    # Rename all files from old names to new names
+    try:
+        clean_author_database(renamed_author, calibre_path, gdrive)
         if first_author and first_author not in renamed_author:
-            clean_author_database([first_author], calibrepath, localbook)
-        if not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+            clean_author_database([first_author], calibre_path, localbook, gdrive)
+        if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
             shutil.rmtree(os.path.dirname(path))
     except (OSError, FileNotFoundError) as ex:
         log.error("Error in rename file in path %s", ex)
@@ -449,6 +473,7 @@ def update_dir_structure_file(book_id, calibrepath, first_author, orignal_filepa
         return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 
+
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     error = False
     book = calibre_db.get_book(book_id)
@@ -457,16 +482,12 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     if first_author:
         new_authordir = get_valid_filename(first_author, chars=96)
         for r in renamed_author:
-            # Todo: Rename all authors on gdrive
             new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
             old_author_dir = get_valid_filename(r, chars=96)
             new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
             if gFile:
                 gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
-            # author is always co-author and has is never author, no folder is okay
-            #else:
-            #    error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
     else:
         new_authordir = get_valid_filename(book.authors[0].name, chars=96)
 
@@ -476,8 +497,7 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     if titledir != new_titledir:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
         if gFile:
-            gFile['title'] = new_titledir
-            gFile.Upload()
+            gd.moveGdriveFileRemote(gFile, new_titledir)
             book.path = book.path.split('/')[0] + u'/' + new_titledir
             gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
         else:
@@ -494,15 +514,9 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
 
     # change location in database to new author/title path
     book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
-
-    # Rename all files from old names to new names
-    clean_author_database(renamed_author, "", gdrive=True)
-    if first_author not in renamed_author:
-        clean_author_database([first_author], "", book, gdrive=True)
-
+    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
     return error
 
-
 def delete_book_gdrive(book, book_format):
     error = None
     if book_format:
@@ -582,19 +596,19 @@ def valid_email(email):
 
 
 def update_dir_structure(book_id,
-                        calibrepath,
-                        first_author=None,
-                        orignal_filepath=None,
-                        db_filename=None,
-                        renamed_author=None):
+                         calibre_path,
+                         first_author=None,     # change author of book to this author
+                         original_filepath=None,
+                         db_filename=None,
+                         renamed_author=None):
     renamed_author = renamed_author or []
     if config.config_use_google_drive:
         return update_dir_structure_gdrive(book_id, first_author, renamed_author)
     else:
         return update_dir_structure_file(book_id,
-                                         calibrepath,
+                                         calibre_path,
                                          first_author,
-                                         orignal_filepath,
+                                         original_filepath,
                                          db_filename, renamed_author)
 
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 5de006fe..2370bc7e 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -10,7 +10,7 @@ pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
-six>=1.10.0,<1.17.0
+# six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0

From cfa6b405dabf6d28aa7996d2783e75618f6a31d8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 13:21:06 +0100
Subject: [PATCH 107/220] Upload files to gdrive with author rename working

---
 cps/editbooks.py |  21 ++++---
 cps/helper.py    | 144 ++++++++++++++++++++++++++---------------------
 2 files changed, 91 insertions(+), 74 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 16e29535..03cbc233 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1027,9 +1027,10 @@ def move_coverfile(meta, db_book):
         coverfile = meta.cover
     else:
         coverfile = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
-    new_coverpath = os.path.join(config.config_calibre_dir, db_book.path, "cover.jpg")
+    new_coverpath = os.path.join(config.config_calibre_dir, db_book.path)
     try:
-        copyfile(coverfile, new_coverpath)
+        os.makedirs(new_coverpath, exist_ok=True)
+        copyfile(coverfile, os.path.join(new_coverpath, "cover.jpg"))
         if meta.cover:
             os.unlink(meta.cover)
     except OSError as e:
@@ -1064,16 +1065,14 @@ def upload():
 
                 book_id = db_book.id
                 title = db_book.title
-                # ToDo this currently doesn't work -> integrate in update_dir_structure_gdrive
                 if config.config_use_google_drive:
-                    file_name = helper.get_valid_filename(title, chars=42) + \
-                                ' - ' + helper.get_valid_filename(input_authors[0], chars=42) +\
-                                meta.extension.lower()
-
-                    gdrive_path = os.path.join(helper.get_valid_filename(input_authors[0], chars=96),
-                                               title_dir + " (" + str(book_id) + ")",
-                                               file_name)
-                    gdriveutils.uploadFileToEbooksFolder(gdrive_path.replace("\\", "/"), meta.file_path)
+                    helper.upload_new_file_gdrive(book_id,
+                                                  input_authors[0],
+                                                  renamed_authors,
+                                                  title,
+                                                  title_dir,
+                                                  meta.file_path,
+                                                  meta.extension.lower())
                 else:
                     error = helper.update_dir_structure(book_id,
                                                         config.config_calibre_dir,
diff --git a/cps/helper.py b/cps/helper.py
index ac538665..150fb85c 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -331,7 +331,7 @@ def delete_book_file(book, calibrepath, book_format=None):
                    path=book.path)
 
 
-def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=None):
+def clean_author_database(renamed_author, calibre_path="", local_book=None, gdrive=None):
     valid_filename_authors = [get_valid_filename(r, chars=96) for r in renamed_author]
     for r in renamed_author:
         if local_book:
@@ -345,7 +345,7 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
                 new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
                 all_new_authordir = get_valid_filename(new_author.name, chars=96)
                 all_titledir = book.path.split('/')[1]
-                all_new_path = os.path.join(calibrepath, all_new_authordir, all_titledir)
+                all_new_path = os.path.join(calibre_path, all_new_authordir, all_titledir)
                 all_new_name = get_valid_filename(book.title, chars=42) + ' - ' \
                                + get_valid_filename(new_author.name, chars=42)
                 # change location in database to new author/title path
@@ -368,6 +368,34 @@ def clean_author_database(renamed_author, calibrepath, local_book=None, gdrive=N
                     file_format.name = all_new_name
 
 
+def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=None, gdrive=False):
+    # Create new_author_dir from parameter or from database
+    # Create new title_dir from database and add id
+    if first_author:
+        new_authordir = get_valid_filename(first_author, chars=96)
+        for r in renamed_author:
+            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
+            old_author_dir = get_valid_filename(r, chars=96)
+            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
+            if gdrive:
+                gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
+                if gFile:
+                    gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
+            else:
+                if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
+                    try:
+                        old_author_path = os.path.join(calibre_path, old_author_dir)
+                        new_author_path = os.path.join(calibre_path, new_author_rename_dir)
+                        shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
+                    except (OSError) as ex:
+                        log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
+                        log.debug(ex, exc_info=True)
+                        return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
+                                 src=old_author_path, dest=new_author_path, error=str(ex))
+    else:
+        new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
+    return new_authordir
+
 # Moves files in file storage during author/title rename, or from temp dir to file storage
 def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
@@ -383,27 +411,12 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
 
     # Create new_authordir from parameter or from database
     # Create new titledir from database and add id
+    new_authordir = rename_all_authors(first_author, renamed_author, calibre_path, localbook)
     if first_author:
-        new_authordir = get_valid_filename(first_author, chars=96)
-        for r in renamed_author:
-            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r, chars=96)
-            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
-            if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
-                try:
-                    old_author_path = os.path.join(calibre_path, old_author_dir)
-                    new_author_path = os.path.join(calibre_path, new_author_rename_dir)
-                    shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
-                except (OSError) as ex:
-                    log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
-                    log.debug(ex, exc_info=True)
-                    return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
-                             src=old_author_path, dest=new_author_path, error=str(ex))
         if first_author.lower() in [r.lower() for r in renamed_author]:
             if os.path.isdir(os.path.join(calibre_path, new_authordir)):
                 path = os.path.join(calibre_path, new_authordir, titledir)
-    else:
-        new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
+
     new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
 
     if titledir != new_titledir or authordir != new_authordir or original_filepath:
@@ -421,6 +434,54 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
     return rename_files_on_change(first_author, renamed_author, localbook, original_filepath, path, calibre_path)
 
 
+def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_dir, original_filepath, filename_ext):
+    error = False
+    book = calibre_db.get_book(book_id)
+    file_name = get_valid_filename(title, chars=42) + ' - ' + \
+                get_valid_filename(first_author, chars=42) + \
+                filename_ext
+    rename_all_authors(first_author, renamed_author, gdrive=True)
+    gdrive_path = os.path.join(get_valid_filename(first_author, chars=96),
+                               title_dir + " (" + str(book_id) + ")")
+    book.path = gdrive_path.replace("\\", "/")
+    gd.uploadFileToEbooksFolder(os.path.join(gdrive_path, file_name).replace("\\", "/"), original_filepath)
+    error |= rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
+    return error
+
+
+def update_dir_structure_gdrive(book_id, first_author, renamed_author):
+    error = False
+    book = calibre_db.get_book(book_id)
+
+    authordir = book.path.split('/')[0]
+    titledir = book.path.split('/')[1]
+    new_authordir = rename_all_authors(first_author, renamed_author, gdrive=True)
+    new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
+
+    if titledir != new_titledir:
+        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
+        if gFile:
+            gd.moveGdriveFileRemote(gFile, new_titledir)
+            book.path = book.path.split('/')[0] + u'/' + new_titledir
+            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
+
+    if authordir != new_authordir and authordir not in renamed_author:
+        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
+        if gFile:
+            gd.moveGdriveFolderRemote(gFile, new_authordir)
+            book.path = new_authordir + u'/' + book.path.split('/')[1]
+            gd.updateDatabaseOnEdit(gFile['id'], book.path)
+        else:
+            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+
+    # change location in database to new author/title path
+    book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
+    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
+    return error
+
+
 def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, db_filename, original_filepath, path):
     new_path = os.path.join(calibre_path, new_authordir, new_titledir)
     new_name = get_valid_filename(localbook.title, chars=96) + ' - ' + new_authordir
@@ -462,7 +523,7 @@ def rename_files_on_change(first_author,
                            gdrive=False):
     # Rename all files from old names to new names
     try:
-        clean_author_database(renamed_author, calibre_path, gdrive)
+        clean_author_database(renamed_author, calibre_path, gdrive=gdrive)
         if first_author and first_author not in renamed_author:
             clean_author_database([first_author], calibre_path, localbook, gdrive)
         if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
@@ -474,49 +535,6 @@ def rename_files_on_change(first_author,
     return False
 
 
-def update_dir_structure_gdrive(book_id, first_author, renamed_author):
-    error = False
-    book = calibre_db.get_book(book_id)
-
-    authordir = book.path.split('/')[0]
-    if first_author:
-        new_authordir = get_valid_filename(first_author, chars=96)
-        for r in renamed_author:
-            new_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == r).first()
-            old_author_dir = get_valid_filename(r, chars=96)
-            new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
-            gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
-            if gFile:
-                gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
-    else:
-        new_authordir = get_valid_filename(book.authors[0].name, chars=96)
-
-    titledir = book.path.split('/')[1]
-    new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
-
-    if titledir != new_titledir:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
-        if gFile:
-            gd.moveGdriveFileRemote(gFile, new_titledir)
-            book.path = book.path.split('/')[0] + u'/' + new_titledir
-            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
-
-    if authordir != new_authordir and authordir not in renamed_author:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
-        if gFile:
-            gd.moveGdriveFolderRemote(gFile, new_authordir)
-            book.path = new_authordir + u'/' + book.path.split('/')[1]
-            gd.updateDatabaseOnEdit(gFile['id'], book.path)
-        else:
-            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
-
-    # change location in database to new author/title path
-    book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
-    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
-    return error
-
 def delete_book_gdrive(book, book_format):
     error = None
     if book_format:

From 7254ce6c812bc78ce36eeafdeac9dc5bd29ef66b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 15:11:50 +0100
Subject: [PATCH 108/220] Prevent delete of everything if database wasn't
 really changed

---
 cps/admin.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index c1931ea4..cfb27783 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1208,15 +1208,16 @@ def _db_configuration_update_helper():
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
-        ub.session.query(ub.Downloads).delete()
-        ub.session.query(ub.ArchivedBook).delete()
-        ub.session.query(ub.ReadBook).delete()
-        ub.session.query(ub.BookShelf).delete()
-        ub.session.query(ub.Bookmark).delete()
-        ub.session.query(ub.KoboReadingState).delete()
-        ub.session.query(ub.KoboStatistics).delete()
-        ub.session.query(ub.KoboSyncedBooks).delete()
-        ub.session_commit()
+        if db_change:
+            ub.session.query(ub.Downloads).delete()
+            ub.session.query(ub.ArchivedBook).delete()
+            ub.session.query(ub.ReadBook).delete()
+            ub.session.query(ub.BookShelf).delete()
+            ub.session.query(ub.Bookmark).delete()
+            ub.session.query(ub.KoboReadingState).delete()
+            ub.session.query(ub.KoboStatistics).delete()
+            ub.session.query(ub.KoboSyncedBooks).delete()
+            ub.session_commit()
         _config_string(to_save, "config_calibre_dir")
         calibre_db.update_config(config)
         if not os.access(os.path.join(config.config_calibre_dir, "metadata.db"), os.W_OK):

From 5b3015619d8f63f47d0afc98ac7e75162070a6a0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 15:36:18 +0100
Subject: [PATCH 109/220] Save book read status on edit in books table

---
 cps/editbooks.py | 36 ++++++++++++++++++------------------
 cps/helper.py    | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 cps/web.py       | 47 +++++++----------------------------------------
 3 files changed, 73 insertions(+), 58 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 03cbc233..4948c2dc 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1151,24 +1151,24 @@ def table_get_custom_enum(c_id):
 def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
-    ret = ""
-    if param =='series_index':
+    # ret = ""
+    if param == 'series_index':
         edit_book_series_index(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
-    elif param =='tags':
+    elif param == 'tags':
         edit_book_tags(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
                        mimetype='application/json')
-    elif param =='series':
+    elif param == 'series':
         edit_book_series(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
                        mimetype='application/json')
-    elif param =='publishers':
+    elif param == 'publishers':
         edit_book_publisher(vals['value'], book)
-        ret =  Response(json.dumps({'success': True,
+        ret = Response(json.dumps({'success': True,
                                     'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
                        mimetype='application/json')
-    elif param =='languages':
+    elif param == 'languages':
         invalid = list()
         edit_book_languages(vals['value'], book, invalid=invalid)
         if invalid:
@@ -1179,9 +1179,9 @@ def edit_list_book(param):
             lang_names = list()
             for lang in book.languages:
                 lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
-            ret =  Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
                             mimetype='application/json')
-    elif param =='author_sort':
+    elif param == 'author_sort':
         book.author_sort = vals['value']
         ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
                        mimetype='application/json')
@@ -1191,27 +1191,27 @@ def edit_list_book(param):
         helper.update_dir_structure(book.id, config.config_calibre_dir)
         ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
                        mimetype='application/json')
-    elif param =='sort':
+    elif param == 'sort':
         book.sort = vals['value']
         ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
                        mimetype='application/json')
-    elif param =='comments':
+    elif param == 'comments':
         edit_book_comments(vals['value'], book)
         ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
                        mimetype='application/json')
-    elif param =='authors':
+    elif param == 'authors':
         input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
         helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
         ret = Response(json.dumps({'success': True,
                                    'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
                        mimetype='application/json')
-    elif param =='is_archived':
-        change_archived_books(book.id, vals['value']=="True")
+    elif param == 'is_archived':
+        change_archived_books(book.id, vals['value'] == "True")
         ret = ""
-    elif param =='read_status':
-        # ToDo save
-        ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                       mimetype='application/json')
+    elif param == 'read_status':
+        ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
+        if ret:
+            return ret, 400
     elif param.startswith("custom_column_"):
         new_val = dict()
         new_val[param] = vals['value']
diff --git a/cps/helper.py b/cps/helper.py
index 150fb85c..b5495930 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -35,6 +35,7 @@ from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, text, func
+from sqlalchemy.exc import InvalidRequestError, OperationalError
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash
 from markupsafe import escape
@@ -289,6 +290,53 @@ def get_sorted_author(value):
             value2 = value
     return value2
 
+def edit_book_read_status(book_id, read_status=None):
+    if not config.config_read_column:
+        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:
+            if read_status is None:
+                if book.read_status == ub.ReadBook.STATUS_FINISHED:
+                    book.read_status = ub.ReadBook.STATUS_UNREAD
+                else:
+                    book.read_status = ub.ReadBook.STATUS_FINISHED
+            else:
+                book.read_status = ub.ReadBook.STATUS_FINISHED if read_status else ub.ReadBook.STATUS_UNREAD
+        else:
+            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("Book {} readbit toggled".format(book_id))
+    else:
+        try:
+            calibre_db.update_title_sort(config)
+            book = calibre_db.get_filtered_book(book_id)
+            read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
+            if len(read_status):
+                if read_status is None:
+                    read_status[0].value = not read_status[0].value
+                else:
+                    read_status[0].value = read_status is True
+                calibre_db.session.commit()
+            else:
+                cc_class = db.cc_classes[config.config_read_column]
+                new_cc = cc_class(value=read_status or 1, book=book_id)
+                calibre_db.session.add(new_cc)
+                calibre_db.session.commit()
+        except (KeyError, AttributeError):
+            log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)
+        except (OperationalError, InvalidRequestError) as e:
+            calibre_db.session.rollback()
+            log.error(u"Read status could not set: {}".format(e))
+            return "Read status could not set: {}".format(e), 400
+    return ""
 
 # Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
 def delete_book_file(book, calibrepath, book_format=None):
diff --git a/cps/web.py b/cps/web.py
index 018c0002..6d33f809 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,7 +50,8 @@ from . import calibre_db, kobo_sync_status
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, check_email, check_username, \
     get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
-    send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email
+    send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email, \
+    edit_book_read_status
 from .pagination import Pagination
 from .redirect import redirect_back
 from .usermanagement import login_required_if_no_ano
@@ -154,46 +155,12 @@ def bookmark(book_id, book_format):
 @web.route("/ajax/toggleread/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_read(book_id):
-    if not config.config_read_column:
-        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:
-            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(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("Book {} readbit toggled".format(book_id))
+    message = edit_book_read_status(book_id)
+    if message:
+        return message, 400
     else:
-        try:
-            calibre_db.update_title_sort(config)
-            book = calibre_db.get_filtered_book(book_id)
-            read_status = getattr(book, 'custom_column_' + str(config.config_read_column))
-            if len(read_status):
-                read_status[0].value = not read_status[0].value
-                calibre_db.session.commit()
-            else:
-                cc_class = db.cc_classes[config.config_read_column]
-                new_cc = cc_class(value=1, book=book_id)
-                calibre_db.session.add(new_cc)
-                calibre_db.session.commit()
-        except (KeyError, AttributeError):
-            log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
-            return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column), 400
-        except (OperationalError, InvalidRequestError) as e:
-            calibre_db.session.rollback()
-            log.error(u"Read status could not set: {}".format(e))
-            return "Read status could not set: {}".format(e), 400
-    return ""
+        return message
+
 
 @web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
 @login_required

From 0ce41aef56c718e37114ba1ece97c1ab5bed2267 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 19:05:14 +0100
Subject: [PATCH 110/220] Detect missing database file also in gdrive mode

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

diff --git a/cps/config_sql.py b/cps/config_sql.py
index ebc4ca24..5b94fc02 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -304,9 +304,8 @@ class _ConfigSQL(object):
 
         have_metadata_db = bool(self.config_calibre_dir)
         if have_metadata_db:
-            if not self.config_use_google_drive:
-                db_file = os.path.join(self.config_calibre_dir, 'metadata.db')
-                have_metadata_db = os.path.isfile(db_file)
+            db_file = os.path.join(self.config_calibre_dir, 'metadata.db')
+            have_metadata_db = os.path.isfile(db_file)
         self.db_configured = have_metadata_db
         constants.EXTENSIONS_UPLOAD = [x.lstrip().rstrip().lower() for x in self.config_upload_formats.split(',')]
         if os.environ.get('FLASK_DEBUG'):

From 89877835b30df88953e60f167112eaff53284312 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 5 Feb 2022 19:05:26 +0100
Subject: [PATCH 111/220] Detect missing database file also in gdrive mode

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

diff --git a/cps/config_sql.py b/cps/config_sql.py
index ebc4ca24..5b94fc02 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -304,9 +304,8 @@ class _ConfigSQL(object):
 
         have_metadata_db = bool(self.config_calibre_dir)
         if have_metadata_db:
-            if not self.config_use_google_drive:
-                db_file = os.path.join(self.config_calibre_dir, 'metadata.db')
-                have_metadata_db = os.path.isfile(db_file)
+            db_file = os.path.join(self.config_calibre_dir, 'metadata.db')
+            have_metadata_db = os.path.isfile(db_file)
         self.db_configured = have_metadata_db
         constants.EXTENSIONS_UPLOAD = [x.lstrip().rstrip().lower() for x in self.config_upload_formats.split(',')]
         if os.environ.get('FLASK_DEBUG'):

From 895f68033f3849c34328bc523f1f9812c4171b93 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 14:22:55 +0100
Subject: [PATCH 112/220] Improved detection of changed database

---
 cps/MyLoginManager.py                   |    5 +-
 cps/__init__.py                         |    2 +-
 cps/admin.py                            |   11 +-
 cps/config_sql.py                       |   24 +-
 cps/db.py                               |   22 +-
 cps/gdriveutils.py                      |    3 +-
 cps/kobo_sync_status.py                 |    2 +-
 cps/tasks/convert.py                    |    4 +-
 cps/ub.py                               |  123 +-
 test/Calibre-Web TestSummary_Linux.html | 1447 +++++++++++++++++++++--
 10 files changed, 1456 insertions(+), 187 deletions(-)

diff --git a/cps/MyLoginManager.py b/cps/MyLoginManager.py
index 7c916bd5..2f06be94 100644
--- a/cps/MyLoginManager.py
+++ b/cps/MyLoginManager.py
@@ -27,8 +27,9 @@ from flask import session
 
 class MyLoginManager(LoginManager):
     def _session_protection_failed(self):
-        sess = session._get_current_object()
+        _session = session._get_current_object()
         ident = self._session_identifier_generator()
-        if(sess and not (len(sess) == 1 and sess.get('csrf_token', None))) and ident != sess.get('_id', None):
+        if(_session and not (len(_session) == 1
+                             and _session.get('csrf_token', None))) and ident != _session.get('_id', None):
             return super(). _session_protection_failed()
         return False
diff --git a/cps/__init__.py b/cps/__init__.py
index 2bfee12e..2dfad699 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -156,7 +156,7 @@ def create_app():
         services.goodreads_support.connect(config.config_goodreads_api_key,
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
-
+    config.store_calibre_uuid(calibre_db, db.Library_Id)
     return app
 
 @babel.localeselector
diff --git a/cps/admin.py b/cps/admin.py
index 71186b51..4876d421 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1192,8 +1192,10 @@ def _db_simulate_change():
                                            '',
                                            param['config_calibre_dir'],
                                            flags=re.IGNORECASE).strip()
-    db_change = config.config_calibre_dir != to_save["config_calibre_dir"] and config.config_calibre_dir
-    db_valid = calibre_db.check_valid_db(to_save["config_calibre_dir"], ub.app_DB_path)
+    db_valid, db_change = calibre_db.check_valid_db(to_save["config_calibre_dir"],
+                                                    ub.app_DB_path,
+                                                    config.config_calibre_uuid)
+    db_change = bool(db_change and config.config_calibre_dir)
     return db_change, db_valid
 
 
@@ -1223,12 +1225,15 @@ def _db_configuration_update_helper():
     except Exception as ex:
         return _db_configuration_result('{}'.format(ex), gdrive_error)
 
-    if db_change or not db_valid or not config.db_configured:
+    if db_change or not db_valid or not config.db_configured \
+          or config.config_calibre_dir != to_save["config_calibre_dir"]:
         if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
+        config.store_calibre_uuid(calibre_db, db.Library_Id)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
+            log.info("Calibre Database changed, delete all Calibre-Web info related to old Database")
             ub.session.query(ub.Downloads).delete()
             ub.session.query(ub.ArchivedBook).delete()
             ub.session.query(ub.ReadBook).delete()
diff --git a/cps/config_sql.py b/cps/config_sql.py
index 5b94fc02..01523a01 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -62,6 +62,7 @@ class _Settings(_Base):
     mail_gmail_token = Column(JSON, default={})
 
     config_calibre_dir = Column(String)
+    config_calibre_uuid = Column(String)
     config_port = Column(Integer, default=constants.DEFAULT_PORT)
     config_external_port = Column(Integer, default=constants.DEFAULT_PORT)
     config_certfile = Column(String)
@@ -350,6 +351,14 @@ class _ConfigSQL(object):
         # self.config_calibre_dir = None
         self.save()
 
+    def store_calibre_uuid(self, calibre_db, Library_table):
+        try:
+            calibre_uuid = calibre_db.session.query(Library_table).one_or_none()
+            if self.config_calibre_uuid != calibre_uuid.uuid:
+                self.config_calibre_uuid = calibre_uuid.uuid
+                self.save()
+        except AttributeError:
+            pass
 
 def _migrate_table(session, orm_class):
     changed = False
@@ -438,19 +447,12 @@ def load_configuration(session):
         session.add(_Settings())
         session.commit()
     conf = _ConfigSQL(session)
-    # Migrate from global restrictions to user based restrictions
-    #if bool(conf.config_default_show & constants.MATURE_CONTENT) and conf.config_denied_tags == "":
-    #    conf.config_denied_tags = conf.config_mature_content_tags
-    #    conf.save()
-    #    session.query(ub.User).filter(ub.User.mature_content != True). \
-    #        update({"denied_tags": conf.config_mature_content_tags}, synchronize_session=False)
-    #    session.commit()
     return conf
 
-def get_flask_session_key(session):
-    flask_settings = session.query(_Flask_Settings).one_or_none()
+def get_flask_session_key(_session):
+    flask_settings = _session.query(_Flask_Settings).one_or_none()
     if flask_settings == None:
         flask_settings = _Flask_Settings(os.urandom(32))
-        session.add(flask_settings)
-        session.commit()
+        _session.add(flask_settings)
+        _session.commit()
     return flask_settings.flask_session_key
diff --git a/cps/db.py b/cps/db.py
index aa697ec6..a3b93d89 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -93,6 +93,12 @@ books_publishers_link = Table('books_publishers_link', Base.metadata,
                               )
 
 
+class Library_Id(Base):
+    __tablename__ = 'library_id'
+    id = Column(Integer, primary_key=True)
+    uuid = Column(String, nullable=False)
+
+
 class Identifiers(Base):
     __tablename__ = 'identifiers'
 
@@ -525,12 +531,12 @@ class CalibreDB():
         return cc_classes
 
     @classmethod
-    def check_valid_db(cls, config_calibre_dir, app_db_path):
+    def check_valid_db(cls, config_calibre_dir, app_db_path, config_calibre_uuid):
         if not config_calibre_dir:
-            return False
+            return False, False
         dbpath = os.path.join(config_calibre_dir, "metadata.db")
         if not os.path.exists(dbpath):
-            return False
+            return False, False
         try:
             check_engine = create_engine('sqlite://',
                           echo=False,
@@ -540,10 +546,16 @@ class CalibreDB():
             with check_engine.begin() as connection:
                 connection.execute(text("attach database '{}' as calibre;".format(dbpath)))
                 connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
+                local_session = scoped_session(sessionmaker())
+                local_session.configure(bind=connection)
+                database_uuid = local_session().query(Library_Id).one_or_none()
+                # local_session.dispose()
+
             check_engine.connect()
+            db_change = config_calibre_uuid != database_uuid.uuid
         except Exception:
-            return False
-        return True
+            return False, False
+        return True, db_change
 
     @classmethod
     def update_config(cls, config):
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index eae175a0..57f272ff 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -196,7 +196,8 @@ def migrate():
 if not os.path.exists(cli.gdpath):
     try:
         Base.metadata.create_all(engine)
-    except Exception:
+    except Exception as ex:
+        log.error("Error connect to database: {} - {}".format(cli.gdpath, ex))
         raise
 migrate()
 
diff --git a/cps/kobo_sync_status.py b/cps/kobo_sync_status.py
index 19679e59..7a201861 100644
--- a/cps/kobo_sync_status.py
+++ b/cps/kobo_sync_status.py
@@ -47,7 +47,7 @@ def remove_synced_book(book_id, all=False, session=None):
         ub.session_commit()
     else:
         session.query(ub.KoboSyncedBooks).filter(ub.KoboSyncedBooks.book_id == book_id).filter(user).delete()
-        ub.session_commit(sess=session)
+        ub.session_commit(_session=session)
 
 
 
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 596bf95c..8fd544a8 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -31,7 +31,7 @@ from cps import logger, config
 from cps.subproc_wrapper import process_open
 from flask_babel import gettext as _
 from cps.kobo_sync_status import remove_synced_book
-from cps.ub import ini
+from cps.ub import init_db_thread
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
@@ -148,7 +148,7 @@ class TaskConvert(CalibreTask):
                     local_db.session.merge(new_format)
                     local_db.session.commit()
                     if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
-                        ub_session = ini()
+                        ub_session = init_db_thread()
                         remove_synced_book(book_id, True, ub_session)
                         ub_session.close()
                 except SQLAlchemyError as e:
diff --git a/cps/ub.py b/cps/ub.py
index e52ce201..786dc909 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -37,6 +37,7 @@ except ImportError as e:
         from flask_dance.consumer.storage.sqla import OAuthConsumerMixin
         oauth_support = True
     except ImportError as e:
+        OAuthConsumerMixin = BaseException
         oauth_support = False
 from sqlalchemy import create_engine, exc, exists, event, text
 from sqlalchemy import Column, ForeignKey
@@ -510,7 +511,7 @@ class RemoteAuthToken(Base):
 
 
 # Add missing tables during migration of database
-def add_missing_tables(engine, session):
+def add_missing_tables(engine, _session):
     if not engine.dialect.has_table(engine.connect(), "book_read_link"):
         ReadBook.__table__.create(bind=engine)
     if not engine.dialect.has_table(engine.connect(), "bookmark"):
@@ -527,26 +528,26 @@ def add_missing_tables(engine, session):
         Registration.__table__.create(bind=engine)
         with engine.connect() as conn:
             conn.execute("insert into registration (domain, allow) values('%.%',1)")
-        session.commit()
+        _session.commit()
 
 
 # migrate all settings missing in registration table
-def migrate_registration_table(engine, session):
+def migrate_registration_table(engine, _session):
     try:
-        session.query(exists().where(Registration.allow)).scalar()
-        session.commit()
+        _session.query(exists().where(Registration.allow)).scalar()
+        _session.commit()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE registration ADD column 'allow' INTEGER")
             conn.execute("update registration set 'allow' = 1")
-        session.commit()
+        _session.commit()
     try:
         # Handle table exists, but no content
-        cnt = session.query(Registration).count()
+        cnt = _session.query(Registration).count()
         if not cnt:
             with engine.connect() as conn:
                 conn.execute("insert into registration (domain, allow) values('%.%',1)")
-            session.commit()
+            _session.commit()
     except exc.OperationalError:  # Database is not writeable
         print('Settings database is not writeable. Exiting...')
         sys.exit(2)
@@ -564,9 +565,9 @@ def migrate_guest_password(engine):
         sys.exit(2)
 
 
-def migrate_shelfs(engine, session):
+def migrate_shelfs(engine, _session):
     try:
-        session.query(exists().where(Shelf.uuid)).scalar()
+        _session.query(exists().where(Shelf.uuid)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("ALTER TABLE shelf ADD column 'uuid' STRING")
@@ -574,33 +575,33 @@ def migrate_shelfs(engine, session):
             conn.execute("ALTER TABLE shelf ADD column 'last_modified' DATETIME")
             conn.execute("ALTER TABLE book_shelf_link ADD column 'date_added' DATETIME")
             conn.execute("ALTER TABLE shelf ADD column 'kobo_sync' BOOLEAN DEFAULT false")
-        for shelf in session.query(Shelf).all():
+        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():
+        for book_shelf in _session.query(BookShelf).all():
             book_shelf.date_added = datetime.datetime.now()
-        session.commit()
+        _session.commit()
 
     try:
-        session.query(exists().where(Shelf.kobo_sync)).scalar()
+        _session.query(exists().where(Shelf.kobo_sync)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
 
             conn.execute("ALTER TABLE shelf ADD column 'kobo_sync' BOOLEAN DEFAULT false")
-        session.commit()
+        _session.commit()
 
     try:
-        session.query(exists().where(BookShelf.order)).scalar()
+        _session.query(exists().where(BookShelf.order)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE book_shelf_link ADD column 'order' INTEGER DEFAULT 1")
-        session.commit()
+        _session.commit()
 
 
-def migrate_readBook(engine, session):
+def migrate_readBook(engine, _session):
     try:
-        session.query(exists().where(ReadBook.read_status)).scalar()
+        _session.query(exists().where(ReadBook.read_status)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("ALTER TABLE book_read_link ADD column 'read_status' INTEGER DEFAULT 0")
@@ -608,46 +609,46 @@ def migrate_readBook(engine, session):
             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()
-    test = session.query(ReadBook).filter(ReadBook.last_modified == None).all()
+        _session.commit()
+    test = _session.query(ReadBook).filter(ReadBook.last_modified == None).all()
     for book in test:
         book.last_modified = datetime.datetime.utcnow()
-    session.commit()
+    _session.commit()
 
 
-def migrate_remoteAuthToken(engine, session):
+def migrate_remoteAuthToken(engine, _session):
     try:
-        session.query(exists().where(RemoteAuthToken.token_type)).scalar()
-        session.commit()
+        _session.query(exists().where(RemoteAuthToken.token_type)).scalar()
+        _session.commit()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             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()
+        _session.commit()
 
 # Migrate database to current version, has to be updated after every database change. Currently migration from
 # everywhere to current should work. Migration is done by checking if relevant columns are existing, and than adding
 # rows with SQL commands
-def migrate_Database(session):
-    engine = session.bind
-    add_missing_tables(engine, session)
-    migrate_registration_table(engine, session)
-    migrate_readBook(engine, session)
-    migrate_remoteAuthToken(engine, session)
-    migrate_shelfs(engine, session)
+def migrate_Database(_session):
+    engine = _session.bind
+    add_missing_tables(engine, _session)
+    migrate_registration_table(engine, _session)
+    migrate_readBook(engine, _session)
+    migrate_remoteAuthToken(engine, _session)
+    migrate_shelfs(engine, _session)
     try:
         create = False
-        session.query(exists().where(User.sidebar_view)).scalar()
+        _session.query(exists().where(User.sidebar_view)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `sidebar_view` Integer DEFAULT 1")
-        session.commit()
+        _session.commit()
         create = True
     try:
         if create:
             with engine.connect() as conn:
                 conn.execute("SELECT language_books FROM user")
-            session.commit()
+            _session.commit()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("UPDATE user SET 'sidebar_view' = (random_books* :side_random + language_books * :side_lang "
@@ -657,32 +658,32 @@ def migrate_Database(session):
                       '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()
+        _session.commit()
     try:
-        session.query(exists().where(User.denied_tags)).scalar()
+        _session.query(exists().where(User.denied_tags)).scalar()
     except exc.OperationalError:  # Database is not compatible, some columns are missing
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `denied_tags` String DEFAULT ''")
             conn.execute("ALTER TABLE user ADD column `allowed_tags` String DEFAULT ''")
             conn.execute("ALTER TABLE user ADD column `denied_column_value` String DEFAULT ''")
             conn.execute("ALTER TABLE user ADD column `allowed_column_value` String DEFAULT ''")
-        session.commit()
+        _session.commit()
     try:
-        session.query(exists().where(User.view_settings)).scalar()
+        _session.query(exists().where(User.view_settings)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `view_settings` VARCHAR(10) DEFAULT '{}'")
-        session.commit()
+        _session.commit()
     try:
-        session.query(exists().where(User.kobo_only_shelves_sync)).scalar()
+        _session.query(exists().where(User.kobo_only_shelves_sync)).scalar()
     except exc.OperationalError:
         with engine.connect() as conn:
             conn.execute("ALTER TABLE user ADD column `kobo_only_shelves_sync` SMALLINT DEFAULT 0")
-        session.commit()
+        _session.commit()
 
     try:
         # check if name is in User table instead of nickname
-        session.query(exists().where(User.name)).scalar()
+        _session.query(exists().where(User.name)).scalar()
     except exc.OperationalError:
         # Create new table user_id and copy contents of table user into it
         with engine.connect() as conn:
@@ -712,20 +713,20 @@ def migrate_Database(session):
             # delete old user table and rename new user_id table to user:
             conn.execute(text("DROP TABLE user"))
             conn.execute(text("ALTER TABLE user_id RENAME TO user"))
-        session.commit()
-    if session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
+        _session.commit()
+    if _session.query(User).filter(User.role.op('&')(constants.ROLE_ANONYMOUS) == constants.ROLE_ANONYMOUS).first() \
        is None:
-        create_anonymous_user(session)
+        create_anonymous_user(_session)
 
     migrate_guest_password(engine)
 
 
-def clean_database(session):
+def clean_database(_session):
     # Remove expired remote login tokens
     now = datetime.datetime.now()
-    session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).\
+    _session.query(RemoteAuthToken).filter(now > RemoteAuthToken.expiration).\
         filter(RemoteAuthToken.token_type != 1).delete()
-    session.commit()
+    _session.commit()
 
 
 # Save downloaded books per user in calibre-web's own database
@@ -750,22 +751,22 @@ def delete_download(book_id):
         session.rollback()
 
 # Generate user Guest (translated text), as anonymous user, no rights
-def create_anonymous_user(session):
+def create_anonymous_user(_session):
     user = User()
     user.name = "Guest"
     user.email = 'no@email'
     user.role = constants.ROLE_ANONYMOUS
     user.password = ''
 
-    session.add(user)
+    _session.add(user)
     try:
-        session.commit()
+        _session.commit()
     except Exception:
-        session.rollback()
+        _session.rollback()
 
 
 # Generate User admin with admin123 password, and access to everything
-def create_admin_user(session):
+def create_admin_user(_session):
     user = User()
     user.name = "admin"
     user.role = constants.ADMIN_USER_ROLES
@@ -773,13 +774,13 @@ def create_admin_user(session):
 
     user.password = generate_password_hash(constants.DEFAULT_PASSWORD)
 
-    session.add(user)
+    _session.add(user)
     try:
-        session.commit()
+        _session.commit()
     except Exception:
-        session.rollback()
+        _session.rollback()
 
-def ini():
+def init_db_thread():
     global app_DB_path
     engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
 
@@ -844,8 +845,8 @@ def dispose():
             except Exception:
                 pass
 
-def session_commit(success=None, sess=None):
-    s = sess if sess else session
+def session_commit(success=None, _session=None):
+    s = _session if _session else session
     try:
         s.commit()
         if success:
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index bd12238c..af8cfcd9 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-02-01 20:32:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-05 20:19:09</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>2022-02-02 00:57:41</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-06 00:20:42</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>3h 39 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 15 min</p>
         </div>
       </div>
       </div>
@@ -330,13 +330,13 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">2</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">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c3', 2)">Detail</a>
         </td>
@@ -344,20 +344,89 @@
 
     
     
-        <tr id='pt3.1' class='hiddenRow bg-success'>
+        <tr id="et3.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</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_et3.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et3.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 179, in test_cli_gdrive_location
+    self.fill_db_config({&#39;config_google_drive_folder&#39;: &#39;test&#39;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in fill_db_config
+    select = Select(cls.driver.find_element(By.ID, key))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_google_drive_folder&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt3.2' class='hiddenRow bg-success'>
+        <tr id="et3.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</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_et3.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et3.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et3.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 144, in test_gdrive_db_nonwrite
+    self.fill_db_config({&#39;config_use_google_drive&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 250, in fill_db_config
+    ele.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;config_use_google_drive&#34; name=&#34;config_use_google_drive&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (473,225) because another element &lt;div id=&#34;GeneralChangeModal&#34; class=&#34;modal fade in&#34;&gt; obscures it
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementClickInterceptedError@chrome://remote/content/shared/webdriver/Errors.jsm:282:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:166:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1351,12 +1420,12 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
         <td class="text-center">5</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 6)">Detail</a>
@@ -1410,26 +1479,26 @@
     
     
     
-        <tr id="ft13.6" class="none bg-danger">
+        <tr id="et13.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.6')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
+                <div id="div_et13.6" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.6').style.display='none'"><span
+                                onclick="document.getElementById('div_et13.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 562, in test_rename_capital_on_upload
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;34a2afba-2e3f-4f75-bc09-67899f2ccfba&#34;, element=&#34;08372364-79c8-4996-97da-de74437e794d&#34;)&gt; is not false</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 544, in test_rename_capital_on_upload
+    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1617,13 +1686,13 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c15', 1)">Detail</a>
         </td>
@@ -1631,43 +1700,23 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 
     
     
-        <tr id="ft15.1" class="none bg-danger">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</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('c16', 20)">Detail</a>
         </td>
@@ -1675,182 +1724,1360 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id="et16.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_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_et16.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 877, in test_download_book
+    self.assertEqual(len(list_element), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id="et16.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</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_et16.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.2').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 291, in test_edit_author
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id="et16.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</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_et16.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 471, in test_edit_category
+    self.get_book_details(12)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id="et16.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</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_et16.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 638, in test_edit_comments
+    self.get_book_details(12)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id="et16.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</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_et16.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 653, in test_edit_custom_bool
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id="et16.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</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_et16.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 722, in test_edit_custom_categories
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id="et16.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</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_et16.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 740, in test_edit_custom_float
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.8' class='hiddenRow bg-success'>
+        <tr id="et16.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</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_et16.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 756, in test_edit_custom_int
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id="et16.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</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_et16.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 669, in test_edit_custom_rating
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.10' class='hiddenRow bg-success'>
+        <tr id="et16.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</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_et16.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 689, in test_edit_custom_single_select
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.11' class='hiddenRow bg-success'>
+        <tr id="et16.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</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_et16.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 705, in test_edit_custom_text
+    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
+TypeError: object of type &#39;bool&#39; has no len()</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.12' class='hiddenRow bg-success'>
+        <tr id="et16.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</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_et16.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.12').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 580, in test_edit_language
+    self.get_book_details(3)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.13' class='hiddenRow bg-success'>
+        <tr id="et16.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</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_et16.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.13').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 525, in test_edit_publisher
+    self.get_book_details(7)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.14' class='hiddenRow bg-success'>
+        <tr id="et16.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</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_et16.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.14').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 610, in test_edit_rating
+    books = self.get_books_displayed()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1185, in get_books_displayed
+    html = cls.driver.page_source
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 926, in page_source
+    return self.execute(Command.GET_PAGE_SOURCE)[&#39;value&#39;]
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 74, in request
+    return self.request_encode_url(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 96, in request_encode_url
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/source (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.15' class='hiddenRow bg-success'>
+        <tr id="et16.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</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_et16.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.15').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 404, in test_edit_series
+    self.get_book_details(9)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id="et16.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</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_et16.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.16').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 133, in test_edit_title
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.17' class='hiddenRow bg-success'>
+        <tr id="et16.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</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_et16.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 848, in test_upload_book_epub
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id="et16.18" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</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_et16.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 823, in test_upload_book_lit
+    self.fill_basic_config({&#39;config_uploading&#39;:1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.19' class='hiddenRow bg-success'>
+        <tr id="et16.19" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</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_et16.19')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.19" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.19').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 771, in test_upload_cover_hdd
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt16.20' class='hiddenRow bg-success'>
+        <tr id="et16.20" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</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_et16.20')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.20').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 908, in test_watch_metadata
+    button = self.check_element_on_page((By.ID, &#34;enable_gdrive_watch&#34;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in check_element_on_page
+    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2116,11 +3343,11 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestSetupGdrive</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2130,11 +3357,31 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id="ft23.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</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_ft23.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft23.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_gdrive_setup.py&#34;, line 113, in test_config_gdrive
+    self.assertFalse(use_gdrive.is_selected())
+AssertionError: True is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4572,9 +5819,9 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>395</td>
-        <td>2</td>
-        <td>0</td>
+        <td>373</td>
+        <td>1</td>
+        <td>23</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4741,7 +5988,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4771,7 +6018,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4801,7 +6048,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4843,7 +6090,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4879,7 +6126,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4921,7 +6168,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5005,7 +6252,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 </div>
 
 <script>
-    drawCircle(395, 2, 0, 7);
+    drawCircle(373, 1, 23, 7);
     showCase(5);
 </script>
 

From 41f89af9595afc8fe617cdca4f316bb32ccb615b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 14:23:35 +0100
Subject: [PATCH 113/220] Log error in case gdrive.db folder can't be found

---
 cps/gdriveutils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index eae175a0..57f272ff 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -196,7 +196,8 @@ def migrate():
 if not os.path.exists(cli.gdpath):
     try:
         Base.metadata.create_all(engine)
-    except Exception:
+    except Exception as ex:
+        log.error("Error connect to database: {} - {}".format(cli.gdpath, ex))
         raise
 migrate()
 

From 411c13977f030566bdf9505dfce63f5b580f40f9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 16:22:28 +0100
Subject: [PATCH 114/220] Fix for #2294 (cover files in epubs with property as
 property in manifest are now found)

---
 .github/FUNDING.yml |  1 +
 cps/epub.py         | 73 ++++++++++++++++++++++++---------------------
 2 files changed, 40 insertions(+), 34 deletions(-)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..c3d0309e
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: ["https://PayPal.Me/calibreweb",]
diff --git a/cps/epub.py b/cps/epub.py
index cbbdcbbd..b436a755 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -25,15 +25,14 @@ from .helper import split_authors
 from .constants import BookMeta
 
 
-
-def extractCover(zipFile, coverFile, coverpath, tmp_file_name):
-    if coverFile is None:
+def extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
+    if cover_file is None:
         return None
     else:
-        zipCoverPath = os.path.join(coverpath, coverFile).replace('\\', '/')
-        cf = zipFile.read(zipCoverPath)
+        zip_cover_path = os.path.join(cover_path, cover_file).replace('\\', '/')
+        cf = zip_file.read(zip_cover_path)
         prefix = os.path.splitext(tmp_file_name)[0]
-        tmp_cover_name = prefix + '.' + os.path.basename(zipCoverPath)
+        tmp_cover_name = prefix + '.' + os.path.basename(zip_cover_path)
         image = open(tmp_cover_name, 'wb')
         image.write(cf)
         image.close()
@@ -47,12 +46,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         'dc': 'http://purl.org/dc/elements/1.1/'
     }
 
-    epubZip = zipfile.ZipFile(tmp_file_path)
+    epub_zip = zipfile.ZipFile(tmp_file_path)
 
-    txt = epubZip.read('META-INF/container.xml')
+    txt = epub_zip.read('META-INF/container.xml')
     tree = etree.fromstring(txt)
     cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
-    cf = epubZip.read(cfname)
+    cf = epub_zip.read(cfname)
     tree = etree.fromstring(cf)
 
     coverpath = os.path.dirname(cfname)
@@ -86,9 +85,9 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     lang = epub_metadata['language'].split('-', 1)[0].lower()
     epub_metadata['language'] = isoLanguages.get_lang3(lang)
 
-    epub_metadata = parse_epbub_series(ns, tree, epub_metadata)
+    epub_metadata = parse_epub_series(ns, tree, epub_metadata)
 
-    coverfile = parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path)
+    cover_file = parse_epub_cover(ns, tree, epub_zip, coverpath, tmp_file_path)
 
     if not epub_metadata['title']:
         title = original_file_name
@@ -100,7 +99,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         extension=original_file_extension,
         title=title.encode('utf-8').decode('utf-8'),
         author=epub_metadata['creator'].encode('utf-8').decode('utf-8'),
-        cover=coverfile,
+        cover=cover_file,
         description=epub_metadata['description'],
         tags=epub_metadata['subject'].encode('utf-8').decode('utf-8'),
         series=epub_metadata['series'].encode('utf-8').decode('utf-8'),
@@ -108,37 +107,43 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         languages=epub_metadata['language'],
         publisher="")
 
-def parse_ebpub_cover(ns, tree, epubZip, coverpath, tmp_file_path):
-    coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
-    coverfile = None
-    if len(coversection) > 0:
-        coverfile = extractCover(epubZip, coversection[0], coverpath, tmp_file_path)
+
+def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
+    cover_section = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
+    cover_file = None
+    if len(cover_section) > 0:
+        cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
     else:
         meta_cover = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='cover']/@content", namespaces=ns)
         if len(meta_cover) > 0:
-            coversection = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
+            cover_section = tree.xpath(
+                "/pkg:package/pkg:manifest/pkg:item[@id='"+meta_cover[0]+"']/@href", namespaces=ns)
+            if not cover_section:
+                cover_section = tree.xpath(
+                    "/pkg:package/pkg:manifest/pkg:item[@properties='" + meta_cover[0] + "']/@href", namespaces=ns)
         else:
-            coversection = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
-        if len(coversection) > 0:
-            filetype = coversection[0].rsplit('.', 1)[-1]
+            cover_section = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
+        if len(cover_section) > 0:
+            filetype = cover_section[0].rsplit('.', 1)[-1]
             if filetype == "xhtml" or filetype == "html":  # if cover is (x)html format
-                markup = epubZip.read(os.path.join(coverpath, coversection[0]))
-                markupTree = etree.fromstring(markup)
+                markup = epub_zip.read(os.path.join(cover_path, cover_section[0]))
+                markup_tree = etree.fromstring(markup)
                 # no matter xhtml or html with no namespace
-                imgsrc = markupTree.xpath("//*[local-name() = 'img']/@src")
+                img_src = markup_tree.xpath("//*[local-name() = 'img']/@src")
                 # Alternative image source
-                if not len(imgsrc):
-                    imgsrc = markupTree.xpath("//attribute::*[contains(local-name(), 'href')]")
-                if len(imgsrc):
-                    # imgsrc maybe startwith "../"" so fullpath join then relpath to cwd
-                    filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(coverpath, coversection[0])),
-                                                            imgsrc[0]))
-                    coverfile = extractCover(epubZip, filename, "", tmp_file_path)
+                if not len(img_src):
+                    img_src = markup_tree.xpath("//attribute::*[contains(local-name(), 'href')]")
+                if len(img_src):
+                    # img_src maybe start with "../"" so fullpath join then relpath to cwd
+                    filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(cover_path, cover_section[0])),
+                                                            img_src[0]))
+                    cover_file = extract_cover(epub_zip, filename, "", tmp_file_path)
             else:
-                coverfile = extractCover(epubZip, coversection[0], coverpath, tmp_file_path)
-    return coverfile
+                cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
+    return cover_file
 
-def parse_epbub_series(ns, tree, epub_metadata):
+
+def parse_epub_series(ns, tree, epub_metadata):
     series = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='calibre:series']/@content", namespaces=ns)
     if len(series) > 0:
         epub_metadata['series'] = series[0]

From 0c3c0c06649629eae615a9db978eb189e03edfe7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 16:33:12 +0100
Subject: [PATCH 115/220] Improved logging of book title on upload

---
 cps/editbooks.py    | 4 ++--
 cps/tasks/upload.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 4948c2dc..9fce1272 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -670,7 +670,7 @@ def upload_single_file(request, book, book_id):
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
             uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
-            WorkerThread.add(current_user.name, TaskUpload(uploadText))
+            WorkerThread.add(current_user.name, TaskUpload(uploadText), escape(book.title))
 
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
@@ -1092,7 +1092,7 @@ def upload():
                     flash(error, category="error")
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
                 uploadText = _(u"File %(file)s uploaded", file=link)
-                WorkerThread.add(current_user.name, TaskUpload(uploadText))
+                WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(title)))
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
index 2a667c28..e0bb0094 100644
--- a/cps/tasks/upload.py
+++ b/cps/tasks/upload.py
@@ -20,11 +20,12 @@ from datetime import datetime
 from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
 
 class TaskUpload(CalibreTask):
-    def __init__(self, taskMessage):
+    def __init__(self, taskMessage, book_title):
         super(TaskUpload, self).__init__(taskMessage)
         self.start_time = self.end_time = datetime.now()
         self.stat = STAT_FINISH_SUCCESS
         self.progress = 1
+        self.book_title = book_title
 
     def run(self, worker_thread):
         """Upload task doesn't have anything to do, it's simply a way to add information to the task list"""
@@ -34,4 +35,4 @@ class TaskUpload(CalibreTask):
         return "Upload"
 
     def __str__(self):
-        return "Upload {}".format(self.message)
+        return "Upload {}".format(self.book_title)

From 3bb41aca6de1e84b5d0e862224943719eb0ad4da Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Feb 2022 18:57:58 +0100
Subject: [PATCH 116/220] Bugfix for already present mobi file during convert
 (fixes #1900)

---
 cps/tasks/convert.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 596bf95c..90513b09 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -116,8 +116,20 @@ class TaskConvert(CalibreTask):
             log.info("Book id %d already converted to %s", book_id, format_new_ext)
             cur_book = local_db.get_book(book_id)
             self.title = cur_book.title
-            self.results['path'] = file_path
+            self.results['path'] = cur_book.path
             self.results['title'] = self.title
+            new_format = db.Data(name=os.path.basename(file_path),
+                                 book_format=self.settings['new_book_format'].upper(),
+                                 book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
+            try:
+                local_db.session.merge(new_format)
+                local_db.session.commit()
+            except SQLAlchemyError as e:
+                local_db.session.rollback()
+                log.error("Database error: %s", e)
+                local_db.session.close()
+                self._handleError(error_message)
+                return
             self._handleSuccess()
             local_db.session.close()
             return os.path.basename(file_path + format_new_ext)

From 7c623941de04f8c3612facf187b27eb28d29238b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 7 Feb 2022 13:55:18 +0100
Subject: [PATCH 117/220] Bugfixes after testrun Enabled re-encode of
 bookformats

---
 cps/editbooks.py                        |   2 +-
 cps/tasks/convert.py                    |  62 +++----
 test/Calibre-Web TestSummary_Linux.html | 210 +++++++++++++++---------
 3 files changed, 167 insertions(+), 107 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 9fce1272..fcf043a5 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -670,7 +670,7 @@ def upload_single_file(request, book, book_id):
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
             uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
-            WorkerThread.add(current_user.name, TaskUpload(uploadText), escape(book.title))
+            WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(book.title)))
 
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 90513b09..c8b8229c 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -118,21 +118,24 @@ class TaskConvert(CalibreTask):
             self.title = cur_book.title
             self.results['path'] = cur_book.path
             self.results['title'] = self.title
-            new_format = db.Data(name=os.path.basename(file_path),
-                                 book_format=self.settings['new_book_format'].upper(),
-                                 book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
-            try:
-                local_db.session.merge(new_format)
-                local_db.session.commit()
-            except SQLAlchemyError as e:
-                local_db.session.rollback()
-                log.error("Database error: %s", e)
+            new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id)\
+                .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
+            if not new_format:
+                new_format = db.Data(name=os.path.basename(file_path),
+                                     book_format=self.settings['new_book_format'].upper(),
+                                     book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
+                try:
+                    local_db.session.merge(new_format)
+                    local_db.session.commit()
+                except SQLAlchemyError as e:
+                    local_db.session.rollback()
+                    log.error("Database error: %s", e)
+                    local_db.session.close()
+                    self._handleError(error_message)
+                    return
+                self._handleSuccess()
                 local_db.session.close()
-                self._handleError(error_message)
-                return
-            self._handleSuccess()
-            local_db.session.close()
-            return os.path.basename(file_path + format_new_ext)
+                return os.path.basename(file_path + format_new_ext)
         else:
             log.info("Book id %d - target format of %s does not exist. Moving forward with convert.",
                      book_id,
@@ -153,22 +156,25 @@ class TaskConvert(CalibreTask):
         if check == 0:
             cur_book = local_db.get_book(book_id)
             if os.path.isfile(file_path + format_new_ext):
-                new_format = db.Data(name=cur_book.data[0].name,
+                new_format = local_db.session.query(db.Data).filter(db.Data.book == book_id) \
+                    .filter(db.Data.format == self.settings['new_book_format'].upper()).one_or_none()
+                if not new_format:
+                    new_format = db.Data(name=cur_book.data[0].name,
                                          book_format=self.settings['new_book_format'].upper(),
                                          book=book_id, uncompressed_size=os.path.getsize(file_path + format_new_ext))
-                try:
-                    local_db.session.merge(new_format)
-                    local_db.session.commit()
-                    if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
-                        ub_session = ini()
-                        remove_synced_book(book_id, True, ub_session)
-                        ub_session.close()
-                except SQLAlchemyError as e:
-                    local_db.session.rollback()
-                    log.error("Database error: %s", e)
-                    local_db.session.close()
-                    self._handleError(error_message)
-                    return
+                    try:
+                        local_db.session.merge(new_format)
+                        local_db.session.commit()
+                        if self.settings['new_book_format'].upper() in ['KEPUB', 'EPUB', 'EPUB3']:
+                            ub_session = ini()
+                            remove_synced_book(book_id, True, ub_session)
+                            ub_session.close()
+                    except SQLAlchemyError as e:
+                        local_db.session.rollback()
+                        log.error("Database error: %s", e)
+                        local_db.session.close()
+                        self._handleError(error_message)
+                        return
                 self.results['path'] = cur_book.path
                 self.title = cur_book.title
                 self.results['title'] = self.title
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index bd12238c..1be6540c 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-02-01 20:32:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-06 21:09:18</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>2022-02-02 00:57:41</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-07 01:33:46</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>3h 39 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 38 min</p>
         </div>
       </div>
       </div>
@@ -639,11 +639,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -662,11 +662,33 @@
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id="ft8.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</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_ft8.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft8.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft8.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 163, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -681,11 +703,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -704,11 +726,33 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id="ft9.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</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_ft9.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft9.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 213, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -723,13 +767,13 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">19</td>
-        <td class="text-center">17</td>
-        <td class="text-center">0</td>
+        <td class="text-center">15</td>
         <td class="text-center">0</td>
         <td class="text-center">2</td>
+        <td class="text-center">2</td>
         <td class="text-center">
             <a onclick="showClassDetail('c10', 19)">Detail</a>
         </td>
@@ -764,20 +808,70 @@
     
     
     
-        <tr id='pt10.4' class='hiddenRow bg-success'>
+        <tr id="et10.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</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_et10.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 709, in test_delete_role
+    self.fill_basic_config({&#39;config_uploading&#39;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.5' class='hiddenRow bg-success'>
+        <tr id="et10.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_details_popup</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_et10.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 861, in test_details_popup
+    books[1][0][&#39;ele&#39;].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1351,11 +1445,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1410,31 +1504,11 @@
     
     
     
-        <tr id="ft13.6" class="none bg-danger">
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 562, in test_rename_capital_on_upload
-    self.assertFalse(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;34a2afba-2e3f-4f75-bc09-67899f2ccfba&#34;, element=&#34;08372364-79c8-4996-97da-de74437e794d&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1617,13 +1691,13 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c15', 1)">Detail</a>
         </td>
@@ -1631,31 +1705,11 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
 
     
     
-        <tr id="ft15.1" class="none bg-danger">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4572,9 +4626,9 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>395</td>
+        <td>393</td>
+        <td>2</td>
         <td>2</td>
-        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4741,7 +4795,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4771,7 +4825,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4801,7 +4855,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4843,7 +4897,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4879,7 +4933,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4921,7 +4975,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>httplib2</th>
-              <td>0.20.2</td>
+              <td>0.20.4</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5005,7 +5059,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
 </div>
 
 <script>
-    drawCircle(395, 2, 0, 7);
+    drawCircle(393, 2, 2, 7);
     showCase(5);
 </script>
 

From 764389ea2a027a087fbbdcd5264fd57d5c276a70 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 8 Feb 2022 20:15:01 +0100
Subject: [PATCH 118/220] small change

---
 cps/tasks/thumbnail.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index d147f10d..c0887e0a 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -18,6 +18,7 @@
 
 from __future__ import division, print_function, unicode_literals
 import os
+from urllib.request import urlopen
 
 from .. import constants
 from cps import config, db, fs, gdriveutils, logger, ub
@@ -25,10 +26,6 @@ from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
 from datetime import datetime
 from sqlalchemy import func, text, or_
 
-try:
-    from urllib.request import urlopen
-except ImportError as e:
-    from urllib2 import urlopen
 
 try:
     from wand.image import Image
@@ -372,7 +369,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                             dimensions = get_best_fit(width, height, img.width, img.height)
 
                             # resize and crop the image
-                            img.resize(width=int(dimensions['width']), height=int(dimensions['height']), filter='lanczos')
+                            img.resize(width=int(dimensions['width']), height=int(dimensions['height']),
+                                       filter='lanczos')
                             img.crop(width=int(width / 2.0), height=int(height / 2.0), gravity='center')
 
                             # add the image to the canvas

From 461dd05e2f3ddcf5ce47cfaf343d22ea829e50a6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 8 Feb 2022 20:18:32 +0100
Subject: [PATCH 119/220] Readd cache directory to the excluded files during
 update

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

diff --git a/cps/updater.py b/cps/updater.py
index 2166b334..2d62fe79 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -398,7 +398,7 @@ class Updater(threading.Thread):
             os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv',
             os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2',
             os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so', os.sep + 'cps' + os.sep + '.HOMEDIR',
-            os.sep + 'gmail.json', os.sep + 'exclude.txt'
+            os.sep + 'gmail.json', os.sep + 'exclude.txt', os.sep + 'cps' + os.sep + 'cache'
         ]
         try:
             with open(os.path.join(constants.BASE_DIR, "exclude.txt"), "r") as f:

From 0981337cdf5f639b4d917e8f89c72b81be3b99ff Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 9 Feb 2022 20:57:39 +0100
Subject: [PATCH 120/220] Update optional_requirements

---
 cps/dep_check.py          | 2 +-
 optional-requirements.txt | 3 +--
 setup.cfg                 | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cps/dep_check.py b/cps/dep_check.py
index 12436d1d..1c404940 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -3,7 +3,7 @@ import re
 
 from .constants import BASE_DIR
 try:
-    from importlib_metadata import version
+    from importlib.metadata import version
     importlib = True
     ImportNotFound = BaseException
 except ImportError:
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2370bc7e..f7c7b572 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -10,7 +10,6 @@ pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
-# six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
@@ -34,7 +33,7 @@ scholarly>=1.2.0,<1.6
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1
 python-dateutil>=2.1,<2.9.0
-beautifulsoup4>=4.0.1,<4.2.0
+beautifulsoup4>=4.0.1,<4.11.0
 cchardet>=2.0.0,<2.2.0
 
 # Comics
diff --git a/setup.cfg b/setup.cfg
index 5053d19f..98df890c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,7 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires = 
+	APScheduler>=3.6.3,<3.8.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
 	Flask-Login>=0.3.2,<0.5.1
@@ -70,7 +71,6 @@ gdrive =
 	PyDrive2>=1.3.1,<1.11.0
 	PyYAML>=3.12
 	rsa>=3.4.2,<4.9.0
-	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
 	google-api-python-client>=1.7.11,<2.37.0
@@ -89,7 +89,7 @@ metadata =
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0
-	beautifulsoup4>=4.0.1,<4.2.0
+	beautifulsoup4>=4.0.1,<4.11.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
 	natsort>=2.2.0,<8.2.0

From 7317084a4ed9c03f109e27e4a478dee840e69726 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 11:11:08 +0100
Subject: [PATCH 121/220] Update requirements

---
 optional-requirements.txt | 1 -
 setup.cfg                 | 1 -
 2 files changed, 2 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 2370bc7e..123f4686 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -10,7 +10,6 @@ pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.11.0
 PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
-# six>=1.10.0,<1.17.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.5.0
diff --git a/setup.cfg b/setup.cfg
index 5053d19f..e6774776 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -70,7 +70,6 @@ gdrive =
 	PyDrive2>=1.3.1,<1.11.0
 	PyYAML>=3.12
 	rsa>=3.4.2,<4.9.0
-	six>=1.10.0,<1.17.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
 	google-api-python-client>=1.7.11,<2.37.0

From 295888c654b114f350c2973bd12f8865af54f962 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 11:20:09 +0100
Subject: [PATCH 122/220] Find imports in executables

---
 cps/about.py     |  1 +
 cps/dep_check.py | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 7ff178e3..ec7b1172 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -81,6 +81,7 @@ else:
     calibre_web_version = (constants.STABLE_VERSION['version'] + ' - '
                            + constants.NIGHTLY_VERSION[0].replace('%', '%%') + ' - '
                            + constants.NIGHTLY_VERSION[1].replace('%', '%%'))
+
 if getattr(sys, 'frozen', False):
     calibre_web_version += " - Exe-Version"
 elif constants.HOME_CONFIG:
diff --git a/cps/dep_check.py b/cps/dep_check.py
index 12436d1d..5e8e36cf 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -1,5 +1,7 @@
 import os
 import re
+import sys
+import json
 
 from .constants import BASE_DIR
 try:
@@ -8,7 +10,7 @@ try:
     ImportNotFound = BaseException
 except ImportError:
     importlib = False
-
+    version = None
 
 if not importlib:
     try:
@@ -20,6 +22,9 @@ if not importlib:
 
 def load_dependencys(optional=False):
     deps = list()
+    if getattr(sys, 'frozen', False):
+        with open(os.path.join(BASE_DIR, ".pip_installed")) as f:
+            exe_deps = json.loads(f.readlines())
     if importlib or pkgresources:
         if optional:
             req_path = os.path.join(BASE_DIR, "optional-requirements.txt")
@@ -31,10 +36,13 @@ def load_dependencys(optional=False):
                     if not line.startswith('#') and not line == '\n' and not line.startswith('git'):
                         res = re.match(r'(.*?)([<=>\s]+)([\d\.]+),?\s?([<=>\s]+)?([\d\.]+)?', line.strip())
                         try:
-                            if importlib:
-                                dep_version = version(res.group(1))
+                            if getattr(sys, 'frozen', False):
+                                dep_version = exe_deps[res.group(1).lower()]
                             else:
-                                dep_version = pkg_resources.get_distribution(res.group(1)).version
+                                if importlib:
+                                    dep_version = version(res.group(1))
+                                else:
+                                    dep_version = pkg_resources.get_distribution(res.group(1)).version
                         except ImportNotFound:
                             if optional:
                                 continue

From 0436f0f9b252dc4a35a232abfd5a02657c02b42c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 11:58:56 +0100
Subject: [PATCH 123/220] Improved dependency check for executables

---
 cps/dep_check.py          | 12 ++++++++----
 optional-requirements.txt |  2 +-
 requirements.txt          |  2 +-
 setup.cfg                 |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cps/dep_check.py b/cps/dep_check.py
index 5e8e36cf..84e16e85 100644
--- a/cps/dep_check.py
+++ b/cps/dep_check.py
@@ -23,8 +23,12 @@ if not importlib:
 def load_dependencys(optional=False):
     deps = list()
     if getattr(sys, 'frozen', False):
-        with open(os.path.join(BASE_DIR, ".pip_installed")) as f:
-            exe_deps = json.loads(f.readlines())
+        pip_installed = os.path.join(BASE_DIR, ".pip_installed")
+        if os.path.exists(pip_installed):
+            with open(pip_installed) as f:
+                exe_deps = json.loads("".join(f.readlines()))
+        else:
+            return deps
     if importlib or pkgresources:
         if optional:
             req_path = os.path.join(BASE_DIR, "optional-requirements.txt")
@@ -37,13 +41,13 @@ def load_dependencys(optional=False):
                         res = re.match(r'(.*?)([<=>\s]+)([\d\.]+),?\s?([<=>\s]+)?([\d\.]+)?', line.strip())
                         try:
                             if getattr(sys, 'frozen', False):
-                                dep_version = exe_deps[res.group(1).lower()]
+                                dep_version = exe_deps[res.group(1).lower().replace('_','-')]
                             else:
                                 if importlib:
                                     dep_version = version(res.group(1))
                                 else:
                                     dep_version = pkg_resources.get_distribution(res.group(1)).version
-                        except ImportNotFound:
+                        except (ImportNotFound, KeyError):
                             if optional:
                                 continue
                             dep_version = "not installed"
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 123f4686..f7c7b572 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -33,7 +33,7 @@ scholarly>=1.2.0,<1.6
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1
 python-dateutil>=2.1,<2.9.0
-beautifulsoup4>=4.0.1,<4.2.0
+beautifulsoup4>=4.0.1,<4.11.0
 cchardet>=2.0.0,<2.2.0
 
 # Comics
diff --git a/requirements.txt b/requirements.txt
index 0b95dfa3..d9bed7bb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0
 iso-639>=0.4.5,<0.5.0
-PyPDF3>=1.0.0,<1.0.6
+PyPDF3>=1.0.0,<1.0.7
 pytz>=2016.10
 requests>=2.11.1,<2.28.0
 SQLAlchemy>=1.3.0,<1.5.0
diff --git a/setup.cfg b/setup.cfg
index e6774776..12874151 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,7 +45,7 @@ install_requires =
 	backports_abc>=0.4
 	Flask>=1.0.2,<2.1.0
 	iso-639>=0.4.5,<0.5.0
-	PyPDF3>=1.0.0,<1.0.6
+	PyPDF3>=1.0.0,<1.0.7
 	pytz>=2016.10
 	requests>=2.11.1,<2.28.0
 	SQLAlchemy>=1.3.0,<1.5.0
@@ -88,7 +88,7 @@ metadata =
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0
-	beautifulsoup4>=4.0.1,<4.2.0
+	beautifulsoup4>=4.0.1,<4.11.0
 	cchardet>=2.0.0,<2.2.0
 comics = 
 	natsort>=2.2.0,<8.2.0

From 6b026513cbe877c1ac103e0fcaf92a1e90719183 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:12:30 +0100
Subject: [PATCH 124/220] refactored about

---
 cps/about.py | 86 ++++++++--------------------------------------------
 1 file changed, 12 insertions(+), 74 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index ec7b1172..8f2bf715 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -25,47 +25,15 @@ import platform
 import sqlite3
 from collections import OrderedDict
 
-import babel
-import pytz
-import requests
-import sqlalchemy
 import werkzeug
 import flask
 import flask_login
-import flask_principal
 import jinja2
 from flask_babel import gettext as _
-try:
-    from flask_wtf import __version__ as flaskwtf_version
-except ImportError:
-    flaskwtf_version = _(u'not installed')
 
-from . import db, calibre_db, converter, uploader, server, isoLanguages, constants, gdriveutils, dep_check
+from . import db, calibre_db, converter, uploader, constants, dep_check
 from .render_template import render_title_template
 
-try:
-    from flask_login import __version__ as flask_loginVersion
-except ImportError:
-    from flask_login.__about__ import __version__ as flask_loginVersion
-try:
-    # pylint: disable=unused-import
-    import unidecode
-    # _() necessary to make babel aware of string for translation
-    unidecode_version = _(u'installed')
-except ImportError:
-    unidecode_version = _(u'not installed')
-
-try:
-    from flask_dance import __version__ as flask_danceVersion
-except ImportError:
-    flask_danceVersion = None
-
-try:
-    from greenlet import __version__ as greenlet_Version
-except ImportError:
-    greenlet_Version = None
-
-from . import services
 
 about = flask.Blueprint('about', __name__)
 
@@ -87,47 +55,17 @@ if getattr(sys, 'frozen', False):
 elif constants.HOME_CONFIG:
     calibre_web_version += " - pyPi"
 
-if not ret:
-    _VERSIONS = OrderedDict(
-        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
-        Python=sys.version,
-        Calibre_Web=calibre_web_version,
-        WebServer=server.VERSION,
-        Flask=flask.__version__,
-        Flask_Login=flask_loginVersion,
-        Flask_Principal=flask_principal.__version__,
-        Flask_WTF=flaskwtf_version,
-        Werkzeug=werkzeug.__version__,
-        Babel=babel.__version__,
-        Jinja2=jinja2.__version__,
-        Requests=requests.__version__,
-        SqlAlchemy=sqlalchemy.__version__,
-        pySqlite=sqlite3.version,
-        SQLite=sqlite3.sqlite_version,
-        iso639=isoLanguages.__version__,
-        pytz=pytz.__version__,
-        Unidecode=unidecode_version,
-        Flask_SimpleLDAP=u'installed' if bool(services.ldap) else None,
-        python_LDAP=services.ldapVersion if bool(services.ldapVersion) else None,
-        Goodreads=u'installed' if bool(services.goodreads_support) else None,
-        jsonschema=services.SyncToken.__version__ if bool(services.SyncToken) else None,
-        flask_dance=flask_danceVersion,
-        greenlet=greenlet_Version
-    )
-    _VERSIONS.update(gdriveutils.get_versions())
-    _VERSIONS.update(uploader.get_versions(True))
-else:
-    _VERSIONS = OrderedDict(
-        Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
-        Python=sys.version,
-        Calibre_Web=calibre_web_version,
-        Werkzeug=werkzeug.__version__,
-        Jinja2=jinja2.__version__,
-        pySqlite=sqlite3.version,
-        SQLite=sqlite3.sqlite_version,
-    )
-    _VERSIONS.update(ret)
-    _VERSIONS.update(uploader.get_versions(False))
+_VERSIONS = OrderedDict(
+    Platform='{0[0]} {0[2]} {0[3]} {0[4]} {0[5]}'.format(platform.uname()),
+    Python=sys.version,
+    Calibre_Web=calibre_web_version,
+    Werkzeug=werkzeug.__version__,
+    Jinja2=jinja2.__version__,
+    pySqlite=sqlite3.version,
+    SQLite=sqlite3.sqlite_version,
+)
+_VERSIONS.update(ret)
+_VERSIONS.update(uploader.get_versions(False))
 
 
 def collect_stats():

From ba23ada1fe63ed79326ca4a8f3ff220dc09739b0 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:32:35 +0100
Subject: [PATCH 125/220] Reenable showing of academic cover in case no cover
 was found from scholary

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

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index bbf50fb3..f94a65f4 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -47,7 +47,7 @@ class scholar(Metadata):
             scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
             for result in scholar_gen:
                 match = self._parse_search_result(
-                    result=result, generic_cover=generic_cover, locale=locale
+                    result=result, generic_cover="", locale=locale
                 )
                 val.append(match)
         return val

From 9c5970bbfc0f16e71eeb8641104c09f75d7f16bd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:34:54 +0100
Subject: [PATCH 126/220] Bugfix for empty search results from google

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

diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index 11e86aa1..fbb68965 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -46,7 +46,7 @@ class Google(Metadata):
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = "+".join(tokens)
             results = requests.get(Google.SEARCH_URL + query)
-            for result in results.json()["items"]:
+            for result in results.json().get("items", []):
                 val.append(
                     self._parse_search_result(
                         result=result, generic_cover=generic_cover, locale=locale

From 7bb3cac7fbab8e370287483d6213873566d99038 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Feb 2022 12:41:29 +0100
Subject: [PATCH 127/220] Avoid problems with percent encoded utf-8 abstracts
 on certain chinese papers

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

diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index f94a65f4..b0c10b66 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -17,7 +17,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 import itertools
 from typing import Dict, List, Optional
-from urllib.parse import quote
+from urllib.parse import quote, unquote
 
 try:
     from fake_useragent.errors import FakeUserAgentError
@@ -66,7 +66,7 @@ class scholar(Metadata):
         )
 
         match.cover = result.get("image", {}).get("original_url", generic_cover)
-        match.description = result["bib"].get("abstract", "")
+        match.description = unquote(result["bib"].get("abstract", ""))
         match.publisher = result["bib"].get("venue", "")
         match.publishedDate = result["bib"].get("pub_year") + "-01-01"
         match.identifiers = {"scholar": match.id}

From 8f665ebd5846a3464265c47942d874afb3e45cb6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 9 Feb 2022 18:17:00 +0100
Subject: [PATCH 128/220] Update Teststatus

---
 test/Calibre-Web TestSummary_Linux.html | 2279 +++++++++--------------
 1 file changed, 860 insertions(+), 1419 deletions(-)

diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index af8cfcd9..2ba78125 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-02-05 20:19:09</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-09 06:42:55</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>2022-02-06 00:20:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-02-09 11:35:55</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>3h 15 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 6 min</p>
         </div>
       </div>
       </div>
@@ -330,13 +330,13 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">2</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">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c3', 2)">Detail</a>
         </td>
@@ -344,89 +344,20 @@
 
     
     
-        <tr id="et3.1" class="none bg-info">
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 179, in test_cli_gdrive_location
-    self.fill_db_config({&#39;config_google_drive_folder&#39;: &#39;test&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in fill_db_config
-    select = Select(cls.driver.find_element(By.ID, key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_google_drive_folder&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et3.2" class="none bg-info">
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 144, in test_gdrive_db_nonwrite
-    self.fill_db_config({&#39;config_use_google_drive&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 250, in fill_db_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;config_use_google_drive&#34; name=&#34;config_use_google_drive&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (473,225) because another element &lt;div id=&#34;GeneralChangeModal&#34; class=&#34;modal fade in&#34;&gt; obscures it
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementClickInterceptedError@chrome://remote/content/shared/webdriver/Errors.jsm:282:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:166:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -489,11 +420,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">13</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -503,11 +434,33 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id="ft6.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</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_ft6.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 606, in test_calibre_log
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Failed&#39;
+- Convert: PDF -&gt; ODT: book9
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -521,83 +474,281 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id="ft6.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</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_ft6.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 198, in test_convert_email
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Finished&#39;
+- Convert: PDF -&gt; ODT: book9
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id="ft6.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</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_ft6.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 242, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: book6 send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id="ft6.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</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_ft6.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 328, in test_convert_only
+    self.assertEqual(ret_orig[-6][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; MOBI: book8&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; MOBI: book8
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id="ft6.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</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_ft6.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 568, in test_convert_options
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id="ft6.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</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_ft6.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id="ft6.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</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_ft6.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 142, in test_convert_wrong_excecutable
+    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: book6 send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id="ft6.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</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_ft6.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 508, in test_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id="ft6.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</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_ft6.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 439, in test_email_failed
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id="ft6.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</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_ft6.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 401, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -611,39 +762,105 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id="ft6.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</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_ft6.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id="ft6.14" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</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_ft6.14')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 462, in test_starttls_smtp_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt6.15' class='hiddenRow bg-success'>
+        <tr id="ft6.15" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</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_ft6.15')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 542, in test_user_convert_xss
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
+- Convert: MOBI -&gt; EPUB: Buuko
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">6</td>
         <td class="text-center">0</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -653,66 +870,196 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id="ft7.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</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_ft7.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 193, in test_convert_email
+    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id="ft7.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</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_ft7.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 234, in test_convert_failed_and_email
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Failed&#39;
+- E-mail: Test e-mail
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id="ft7.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</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_ft7.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 324, in test_convert_only
+    self.assertEqual(ret[-6][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
+- E-mail: Test e-mail
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id="ft7.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</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_ft7.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 158, in test_convert_parameter
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; LIT: book8
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id="ft7.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</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_ft7.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 430, in test_email_failed
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Failed&#39;
+- Convert: EPUB -&gt; LIT: book8
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id="ft7.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</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_ft7.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 389, in test_email_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; LIT: book8
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -731,11 +1078,33 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id="ft8.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</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_ft8.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft8.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft8.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 126, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; KEPUB: book7
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -750,11 +1119,11 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -773,11 +1142,33 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id="ft9.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</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_ft9.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft9.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 174, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
+- Convert: EPUB -&gt; KEPUB: book7
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1496,9 +1887,9 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 544, in test_rename_capital_on_upload
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 547, in test_rename_capital_on_upload
+    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1710,13 +2101,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</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('c16', 20)">Detail</a>
         </td>
@@ -1724,1360 +2115,182 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
 
     
     
-        <tr id="et16.1" class="none bg-info">
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 877, in test_download_book
-    self.assertEqual(len(list_element), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.2').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 291, in test_edit_author
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.3" class="none bg-info">
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 471, in test_edit_category
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.4" class="none bg-info">
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 638, in test_edit_comments
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.5" class="none bg-info">
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 653, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.6" class="none bg-info">
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 722, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.7" class="none bg-info">
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 740, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.8" class="none bg-info">
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 756, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.9" class="none bg-info">
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 669, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.10" class="none bg-info">
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 689, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.11" class="none bg-info">
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 705, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.12" class="none bg-info">
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.12').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 580, in test_edit_language
-    self.get_book_details(3)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.13" class="none bg-info">
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.13').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 525, in test_edit_publisher
-    self.get_book_details(7)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.14" class="none bg-info">
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.14').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 610, in test_edit_rating
-    books = self.get_books_displayed()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1185, in get_books_displayed
-    html = cls.driver.page_source
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 926, in page_source
-    return self.execute(Command.GET_PAGE_SOURCE)[&#39;value&#39;]
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 74, in request
-    return self.request_encode_url(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 96, in request_encode_url
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/source (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.15" class="none bg-info">
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.15').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 404, in test_edit_series
-    self.get_book_details(9)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.16" class="none bg-info">
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.16').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 133, in test_edit_title
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.17" class="none bg-info">
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 848, in test_upload_book_epub
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.18" class="none bg-info">
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 823, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.19" class="none bg-info">
+        <tr id='pt16.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.19')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.19').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 771, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.20" class="none bg-info">
+        <tr id='pt16.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.20').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 908, in test_watch_metadata
-    button = self.check_element_on_page((By.ID, &#34;enable_gdrive_watch&#34;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3107,11 +2320,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestSTARTTLS</td>
         <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3121,20 +2334,64 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id="ft18.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</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_ft18.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 81, in test_STARTTLS
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
+- E-mail: Test e-mail
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id="ft18.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</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_ft18.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft18.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft18.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 102, in test_STARTTLS_SSL_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: Buuko send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3149,12 +2406,12 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">3</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c19', 7)">Detail</a>
@@ -3163,20 +2420,64 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id="ft19.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</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_ft19.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 122, in test_SSL_None_setup_error
+    self.assertEqual(&#39;Failed&#39;, ret[-1][&#39;result&#39;])
+AssertionError: &#39;Failed&#39; != &#39;E-mail: Buuko send to Kindle&#39;
+- Failed
++ E-mail: Buuko send to Kindle</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id="ft19.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</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_ft19.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 101, in test_SSL_STARTTLS_setup_error
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
+AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
+- E-mail: Buuko send to Kindle
++ Failed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3199,20 +2500,62 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id="ft19.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</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_ft19.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 79, in test_SSL_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Finished&#39;
+- E-mail: Buuko send to Kindle
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id="et19.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</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_et19.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et19.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et19.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 167, in test_email_limit
+    details = self.get_book_details(int(book_details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
+ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3343,13 +2686,13 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSetupGdrive</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c23', 1)">Detail</a>
         </td>
@@ -3357,31 +2700,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id="ft23.1" class="none bg-danger">
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_gdrive_setup.py&#34;, line 113, in test_config_gdrive
-    self.assertFalse(use_gdrive.is_selected())
-AssertionError: True is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4397,12 +3720,12 @@ AssertionError: True is not false</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c35', 5)">Detail</a>
@@ -4438,11 +3761,33 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id="et35.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</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_et35.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et35.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 222, in sound_test
+    self.delete_book(int(details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
+ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4786,12 +4131,12 @@ AssertionError: True is not false</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">1</td>
         <td class="text-center">
             <a onclick="showClassDetail('c40', 9)">Detail</a>
@@ -4836,20 +4181,90 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id="et40.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</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_et40.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et40.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et40.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
+    button.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id="et40.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</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_et40.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et40.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et40.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
+    performUpdate.click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
+    self._execute(Command.CLICK_ELEMENT)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
+    return self._parent.execute(command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
+webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
+interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
+clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4889,11 +4304,31 @@ AssertionError: True is not false</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id="ft40.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</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_ft40.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft40.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft40.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 409, in test_update_write_protect
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;message&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -5819,9 +5254,9 @@ AssertionError: True is not false</pre>
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>404</td>
-        <td>373</td>
-        <td>1</td>
-        <td>23</td>
+        <td>365</td>
+        <td>27</td>
+        <td>5</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5860,6 +5295,12 @@ AssertionError: True is not false</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>APScheduler</th>
+              <td>3.7.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Babel</th>
               <td>2.9.1</td>
@@ -5976,7 +5417,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Werkzeug</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
@@ -6252,7 +5693,7 @@ AssertionError: True is not false</pre>
 </div>
 
 <script>
-    drawCircle(373, 1, 23, 7);
+    drawCircle(365, 27, 5, 7);
     showCase(5);
 </script>
 

From e9b674f46e3fc08e9e83f3d1b6968725e294c9cf Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 8 Feb 2022 19:35:00 +0100
Subject: [PATCH 129/220] Fix a problem with sending emails from custom domain
 name server (#2301)

---
 cps/tasks/convert.py |  2 ++
 cps/tasks/mail.py    | 54 +++++++++++++++++---------------------------
 2 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index e610b14b..98cd7b48 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -35,6 +35,8 @@ from cps.ub import init_db_thread
 
 from cps.tasks.mail import TaskEmail
 from cps import gdriveutils
+
+
 log = logger.create()
 
 
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 03526c8b..1e652b02 100644
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -23,16 +23,8 @@ import threading
 import socket
 import mimetypes
 
-try:
-    from StringIO import StringIO
-    from email.MIMEBase import MIMEBase
-    from email.MIMEMultipart import MIMEMultipart
-    from email.MIMEText import MIMEText
-except ImportError:
-    from io import StringIO
-    from email.mime.base import MIMEBase
-    from email.mime.multipart import MIMEMultipart
-    from email.mime.text import MIMEText
+from io import StringIO
+from email.message import EmailMessage
 
 
 
@@ -131,19 +123,24 @@ class TaskEmail(CalibreTask):
         self.results = dict()
 
     def prepare_message(self):
-        message = MIMEMultipart()
+        message = EmailMessage()
+        # message = MIMEMultipart()
         message['to'] = self.recipent
         message['from'] = self.settings["mail_from"]
         message['subject'] = self.subject
         message['Message-Id'] = make_msgid('calibre-web')
         message['Date'] = formatdate(localtime=True)
-        text = self.text
-        msg = MIMEText(text.encode('UTF-8'), 'plain', 'UTF-8')
-        message.attach(msg)
+        # text = self.text
+        message.set_content(self.text.encode('UTF-8'), "text", "plain")
         if self.attachment:
-            result = self._get_attachment(self.filepath, self.attachment)
-            if result:
-                message.attach(result)
+            data = self._get_attachment(self.filepath, self.attachment)
+            if data:
+                # Set mimetype
+                content_type, encoding = mimetypes.guess_type(self.attachment)
+                if content_type is None or encoding is not None:
+                    content_type = 'application/octet-stream'
+                main_type, sub_type = content_type.split('/', 1)
+                message.add_attachment(data, maintype=main_type, subtype=sub_type, filename=self.attachment)
             else:
                 self._handleError(u"Attachment not found")
                 return
@@ -226,15 +223,15 @@ class TaskEmail(CalibreTask):
             self._progress = x
 
     @classmethod
-    def _get_attachment(cls, bookpath, filename):
+    def _get_attachment(cls, book_path, filename):
         """Get file as MIMEBase message"""
         calibre_path = config.config_calibre_dir
         if config.config_use_google_drive:
-            df = gdriveutils.getFileFromEbooksFolder(bookpath, filename)
+            df = gdriveutils.getFileFromEbooksFolder(book_path, filename)
             if df:
-                datafile = os.path.join(calibre_path, bookpath, filename)
-                if not os.path.exists(os.path.join(calibre_path, bookpath)):
-                    os.makedirs(os.path.join(calibre_path, bookpath))
+                datafile = os.path.join(calibre_path, book_path, filename)
+                if not os.path.exists(os.path.join(calibre_path, book_path)):
+                    os.makedirs(os.path.join(calibre_path, book_path))
                 df.GetContentFile(datafile)
             else:
                 return None
@@ -244,23 +241,14 @@ class TaskEmail(CalibreTask):
             os.remove(datafile)
         else:
             try:
-                file_ = open(os.path.join(calibre_path, bookpath, filename), 'rb')
+                file_ = open(os.path.join(calibre_path, book_path, filename), 'rb')
                 data = file_.read()
                 file_.close()
             except IOError as e:
                 log.debug_or_exception(e, stacklevel=3)
                 log.error(u'The requested file could not be read. Maybe wrong permissions?')
                 return None
-        # Set mimetype
-        content_type, encoding = mimetypes.guess_type(filename)
-        if content_type is None or encoding is not None:
-            content_type = 'application/octet-stream'
-        main_type, sub_type = content_type.split('/', 1)
-        attachment = MIMEBase(main_type, sub_type)
-        attachment.set_payload(data)
-        encoders.encode_base64(attachment)
-        attachment.add_header('Content-Disposition', 'attachment', filename=filename)
-        return attachment
+        return data
 
     @property
     def name(self):

From ef7c6731bcb2035320fce731114d22b209869928 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 14 Feb 2022 17:35:20 +0100
Subject: [PATCH 130/220] Possible fix for #2301 (sending emails from custom
 domain name server)

---
 cps/tasks/mail.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 cps/tasks/mail.py

diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
old mode 100644
new mode 100755
index 1e652b02..80adbbcc
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -16,7 +16,6 @@
 #  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 sys
 import os
 import smtplib
 import threading
@@ -25,7 +24,7 @@ import mimetypes
 
 from io import StringIO
 from email.message import EmailMessage
-
+from email.utils import parseaddr
 
 
 from email import encoders
@@ -37,6 +36,7 @@ from cps.services import gmail
 from cps import logger, config
 
 from cps import gdriveutils
+import uuid
 
 log = logger.create()
 
@@ -122,15 +122,27 @@ class TaskEmail(CalibreTask):
         self.asyncSMTP = None
         self.results = dict()
 
+    # from calibre code:
+    # https://github.com/kovidgoyal/calibre/blob/731ccd92a99868de3e2738f65949f19768d9104c/src/calibre/utils/smtp.py#L60
+    def get_msgid_domain(self):
+        try:
+            # Parse out the address from the From line, and then the domain from that
+            from_email = parseaddr(self.settings["mail_from"])[1]
+            msgid_domain = from_email.partition('@')[2].strip()
+            # This can sometimes sneak through parseaddr if the input is malformed
+            msgid_domain = msgid_domain.rstrip('>').strip()
+        except Exception:
+            msgid_domain = ''
+        return msgid_domain or 'calibre-web.com'
+
     def prepare_message(self):
         message = EmailMessage()
         # message = MIMEMultipart()
-        message['to'] = self.recipent
-        message['from'] = self.settings["mail_from"]
-        message['subject'] = self.subject
-        message['Message-Id'] = make_msgid('calibre-web')
+        message['From'] = self.settings["mail_from"]
+        message['To'] = self.recipent
+        message['Subject'] = self.subject
         message['Date'] = formatdate(localtime=True)
-        # text = self.text
+        message['Message-Id'] = "{}@{}".format(uuid.uuid4(), self.get_msgid_domain()) # f"<{uuid.uuid4()}@{get_msgid_domain(from_)}>" # make_msgid('calibre-web')
         message.set_content(self.text.encode('UTF-8'), "text", "plain")
         if self.attachment:
             data = self._get_attachment(self.filepath, self.attachment)

From 0aac961cde83c22abd4985f720679aa588f79e05 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 19 Feb 2022 09:41:10 +0100
Subject: [PATCH 131/220] Update readme Bugfix debug logging during update
 unrar-free is now also recognized for displaying unrar version in about
 section, removed unused not configured string

---
 README.md        | 14 +++++---------
 cps/converter.py | 11 ++++++-----
 cps/updater.py   |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index ea9d9ba0..d9c50f7f 100644
--- a/README.md
+++ b/README.md
@@ -40,16 +40,12 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 ## Installation
 
 #### Installation via pip (recommended)
-1. Install calibre web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 
-2. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
-3. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` 
+1. To avoid problems with already installed python dependencies, it's recommended to create a virtual environment for Calibre-Web
+2. Install Calibre-Web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 
+3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
+4. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` 
 
-#### Manual installation
-1. Install dependencies by running `pip3 install --target vendor -r requirements.txt` (python3.x). Alternativly set up a python virtual environment.
-2. Execute the command: `python3 cps.py` (or `nohup python3 cps.py` - recommended if you want to exit the terminal window)
-
-Issues with Ubuntu:
-Please note that running the above install command can fail on some versions of Ubuntu, saying `"can't combine user with prefix"`. This is a [known bug](https://github.com/pypa/pip/issues/3826) and can be remedied by using the command `pip install --system --target vendor -r requirements.txt` instead.
+In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20)
 
 ## Quick start
 
diff --git a/cps/converter.py b/cps/converter.py
index fcbabbfc..bb197467 100644
--- a/cps/converter.py
+++ b/cps/converter.py
@@ -27,7 +27,6 @@ from .subproc_wrapper import process_wait
 log = logger.create()
 
 # _() necessary to make babel aware of string for translation
-_NOT_CONFIGURED = _('not configured')
 _NOT_INSTALLED = _('not installed')
 _EXECUTION_ERROR = _('Execution permissions missing')
 
@@ -48,14 +47,16 @@ def _get_command_version(path, pattern, argument=None):
 
 
 def get_calibre_version():
-    return _get_command_version(config.config_converterpath, r'ebook-convert.*\(calibre', '--version') \
-           or _NOT_CONFIGURED
+    return _get_command_version(config.config_converterpath, r'ebook-convert.*\(calibre', '--version')
 
 
 def get_unrar_version():
-    return _get_command_version(config.config_rarfile_location, r'UNRAR.*\d') or _NOT_CONFIGURED
+    unrar_version = _get_command_version(config.config_rarfile_location, r'UNRAR.*\d')
+    if unrar_version == "not installed":
+        unrar_version = _get_command_version(config.config_rarfile_location, r'unrar.*\d','-V')
+    return unrar_version
 
 def get_kepubify_version():
-    return _get_command_version(config.config_kepubifypath, r'kepubify\s','--version') or _NOT_CONFIGURED
+    return _get_command_version(config.config_kepubifypath, r'kepubify\s','--version')
 
 
diff --git a/cps/updater.py b/cps/updater.py
index 2166b334..181c4374 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -214,7 +214,7 @@ class Updater(threading.Thread):
             if not os.path.exists(dst_dir):
                 try:
                     os.makedirs(dst_dir)
-                    log.debug('Create directory: {}', dst_dir)
+                    log.debug('Create directory: {}'.format(dst_dir))
                 except OSError as e:
                     log.error('Failed creating folder: {} with error {}'.format(dst_dir, e))
                 if change_permissions:
@@ -233,7 +233,7 @@ class Updater(threading.Thread):
                         permission = os.stat(dst_file)
                     try:
                         os.remove(dst_file)
-                        log.debug('Remove file before copy: %s', dst_file)
+                        log.debug('Remove file before copy: {}'.format(dst_file))
                     except OSError as e:
                         log.error('Failed removing file: {} with error {}'.format(dst_file, e))
                 else:

From 8007e450b3178f517b83b0989744c6df38867932 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 19 Feb 2022 10:04:21 +0100
Subject: [PATCH 132/220] Bugfix for cbr support without comicapi

---
 cps/comic.py              | 2 +-
 optional-requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cps/comic.py b/cps/comic.py
index 64711460..9e7f4f8f 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -97,7 +97,7 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
         try:
             rarfile.UNRAR_TOOL = rarExecutable
             cf = rarfile.RarFile(tmp_file_name)
-            for name in cf.getnames():
+            for name in cf.namelist():
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
diff --git a/optional-requirements.txt b/optional-requirements.txt
index f7c7b572..04f7bb0c 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -28,7 +28,7 @@ Flask-Dance>=2.0.0,<5.2.0
 SQLAlchemy-Utils>=0.33.5,<0.39.0
 
 # metadata extraction
-rarfile>=2.7
+rarfile>=3.2
 scholarly>=1.2.0,<1.6
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1

From 86b779f39b3725ecfdb9b8b6e837a219baab26e9 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Fri, 25 Feb 2022 01:01:12 +0800
Subject: [PATCH 133/220] Add douban metadate provider

---
 cps/metadata_provider/douban.py | 175 ++++++++++++++++++++++++++++++++
 1 file changed, 175 insertions(+)
 create mode 100644 cps/metadata_provider/douban.py

diff --git a/cps/metadata_provider/douban.py b/cps/metadata_provider/douban.py
new file mode 100644
index 00000000..5eda21ec
--- /dev/null
+++ b/cps/metadata_provider/douban.py
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 xlivevil
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  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 re
+from concurrent import futures
+from typing import List, Optional
+
+import requests
+from html2text import HTML2Text
+from lxml import etree
+
+from cps import logger
+from cps.services.Metadata import Metadata, MetaRecord, MetaSourceInfo
+
+log = logger.create()
+
+
+def html2text(html: str) -> str:
+
+    h2t = HTML2Text()
+    h2t.body_width = 0
+    h2t.single_line_break = True
+    h2t.emphasis_mark = "*"
+    return h2t.handle(html)
+
+
+class Douban(Metadata):
+    __name__ = "豆瓣"
+    __id__ = "douban"
+    DESCRIPTION = "豆瓣"
+    META_URL = "https://book.douban.com/"
+    SEARCH_URL = "https://www.douban.com/j/search"
+
+    ID_PATTERN = re.compile(r"sid: (?P<id>\d+),")
+    AUTHORS_PATTERN = re.compile(r"作者|译者")
+    PUBLISHER_PATTERN = re.compile(r"出版社")
+    SUBTITLE_PATTERN = re.compile(r"副标题")
+    PUBLISHED_DATE_PATTERN = re.compile(r"出版年")
+    SERIES_PATTERN = re.compile(r"丛书")
+    IDENTIFIERS_PATTERN = re.compile(r"ISBN|统一书号")
+
+    TITTLE_XPATH = "//span[@property='v:itemreviewed']"
+    COVER_XPATH = "//a[@class='nbg']"
+    INFO_XPATH = "//*[@id='info']//span[@class='pl']"
+    TAGS_XPATH = "//a[contains(@class, 'tag')]"
+    DESCRIPTION_XPATH = "//div[@id='link-report']//div[@class='intro']"
+    RATING_XPATH = "//div[@class='rating_self clearfix']/strong"
+
+    session = requests.Session()
+    session.headers = {
+        'user-agent':
+            'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 Edg/98.0.1108.56',
+    }
+
+    def search(
+        self, query: str, generic_cover: str = "", locale: str = "en"
+    ) -> Optional[List[MetaRecord]]:
+        if self.active:
+            log.debug(f"starting search {query} on douban")
+            if title_tokens := list(
+                self.get_title_tokens(query, strip_joiners=False)
+            ):
+                query = "+".join(title_tokens)
+
+            try:
+                r = self.session.get(
+                    self.SEARCH_URL, params={"cat": 1001, "q": query}
+                )
+                r.raise_for_status()
+
+            except Exception as e:
+                log.warning(e)
+                return None
+
+            results = r.json()
+            if results["total"] == 0:
+                return val
+
+            book_id_list = [
+                self.ID_PATTERN.search(item).group("id")
+                for item in results["items"][:10] if self.ID_PATTERN.search(item)
+            ]
+
+            with futures.ThreadPoolExecutor(max_workers=5) as executor:
+
+                fut = [
+                    executor.submit(self._parse_single_book, book_id, generic_cover)
+                    for book_id in book_id_list
+                ]
+                
+                val = [
+                    future.result() 
+                    for future in futures.as_completed(fut) if future.result()
+                ]
+
+        return val
+
+    def _parse_single_book(
+        self, id: str, generic_cover: str = ""
+    ) -> Optional[MetaRecord]:
+        url = f"https://book.douban.com/subject/{id}/"
+
+        try:
+            r = self.session.get(url)
+            r.raise_for_status()
+        except Exception as e:
+            log.warning(e)
+            return None
+
+        match = MetaRecord(
+            id=id,
+            title="",
+            authors=[],
+            url=url,
+            source=MetaSourceInfo(
+                id=self.__id__,
+                description=self.DESCRIPTION,
+                link=self.META_URL,
+            ),
+        )
+
+        html = etree.HTML(r.content.decode("utf8"))
+
+        match.title = html.xpath(self.TITTLE_XPATH)[0].text
+        match.cover = html.xpath(self.COVER_XPATH)[0].attrib["href"] or generic_cover
+        try:
+            rating_num = float(html.xpath(self.RATING_XPATH)[0].text.strip())
+        except ValueError:
+            rating_num = 0
+        match.rating = int(-1 * rating_num // 2 * -1) if rating_num else 0
+
+        tag_elements = html.xpath(self.TAGS_XPATH)
+        if len(tag_elements):
+            match.tags = [tag_element.text for tag_element in tag_elements]
+
+        description_element = html.xpath(self.DESCRIPTION_XPATH)
+        if len(description_element):
+            match.description = html2text(etree.tostring(
+                description_element[-1], encoding="utf8").decode("utf8"))
+
+        info = html.xpath(self.INFO_XPATH)
+
+        for element in info:
+            text = element.text
+            if self.AUTHORS_PATTERN.search(text):
+                next = element.getnext()
+                while next is not None and next.tag != "br":
+                    match.authors.append(next.text)
+                    next = next.getnext()
+            elif self.PUBLISHER_PATTERN.search(text):
+                match.publisher = element.tail.strip()
+            elif self.SUBTITLE_PATTERN.search(text):
+                match.title = f'{match.title}:' + element.tail.strip()
+            elif self.PUBLISHED_DATE_PATTERN.search(text):
+                match.publishedDate = element.tail.strip()
+            elif self.SUBTITLE_PATTERN.search(text):
+                match.series = element.getnext().text
+            elif i_type := self.IDENTIFIERS_PATTERN.search(text):
+                match.identifiers[i_type.group()] = element.tail.strip()
+
+        return match

From 695ce836813969aaffb3dac288536cdf7ff3edc9 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Fri, 25 Feb 2022 01:12:22 +0800
Subject: [PATCH 134/220] Fix Uncaught RangeError

---
 cps/static/js/edit_books.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/edit_books.js b/cps/static/js/edit_books.js
index 0bfe078c..c1eb319d 100644
--- a/cps/static/js/edit_books.js
+++ b/cps/static/js/edit_books.js
@@ -33,7 +33,7 @@ $(".datepicker").datepicker({
     if (results) {
         pubDate = new Date(results[1], parseInt(results[2], 10) - 1, results[3]) || new Date(this.value);
         $(this).next('input')
-            .val(pubDate.toLocaleDateString(language))
+            .val(pubDate.toLocaleDateString(language.replaceAll("_","-")))
             .removeClass("hidden");
     }
 }).trigger("change");

From 97cf20764bcc5ca37a7d58791d350e962c4edbc8 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Fri, 25 Feb 2022 12:18:07 +0800
Subject: [PATCH 135/220] Add exception handling and logger in metadata
 provider

---
 cps/metadata_provider/amazon.py       | 33 +++++++++++++++++++--------
 cps/metadata_provider/comicvine.py    | 16 +++++++++----
 cps/metadata_provider/google.py       | 10 +++++++-
 cps/metadata_provider/lubimyczytac.py | 17 ++++++++++++--
 cps/metadata_provider/scholar.py      | 10 +++++++-
 cps/search_metadata.py                |  2 +-
 cps/static/js/get_meta.js             | 19 +++++++++------
 7 files changed, 81 insertions(+), 26 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index 558edebc..5c74cf71 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -19,15 +19,20 @@
 import concurrent.futures
 import requests
 from bs4 import BeautifulSoup as BS  # requirement
+from typing import List, Optional
 
 try:
     import cchardet #optional for better speed
 except ImportError:
     pass
+from cps import logger
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 #from time import time
 from operator import itemgetter
 
+log = logger.create()
+
+
 class Amazon(Metadata):
     __name__ = "Amazon"
     __id__ = "amazon"
@@ -46,12 +51,16 @@ class Amazon(Metadata):
 
     def search(
         self, query: str, generic_cover: str = "", locale: str = "en"
-    ):
+    ) -> Optional[List[MetaRecord]]:
         #timer=time()
-        def inner(link,index)->[dict,int]:
-             with self.session as session:
-                r = session.get(f"https://www.amazon.com/{link}")
-                r.raise_for_status()
+        def inner(link,index) -> tuple[dict,int]:
+            with self.session as session:
+                try:
+                    r = session.get(f"https://www.amazon.com/{link}")
+                    r.raise_for_status()
+                except Exception as e:
+                    log.warning(e)
+                    return
                 long_soup = BS(r.text, "lxml")  #~4sec :/
                 soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
                 if soup2 is None:
@@ -107,11 +116,15 @@ class Amazon(Metadata):
 
         val = list()
         if self.active:
-            results = self.session.get(
-                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}"
-                f"%2Cdigital-text&ref=nb_sb_noss",
-                headers=self.headers)
-            results.raise_for_status()
+            try:
+                results = self.session.get(
+                    f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}"
+                    f"%2Cdigital-text&ref=nb_sb_noss",
+                    headers=self.headers)
+                results.raise_for_status()
+            except Exception as e:
+                    log.warning(e)
+                    return None
             soup = BS(results.text, 'html.parser')
             links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
                           soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
diff --git a/cps/metadata_provider/comicvine.py b/cps/metadata_provider/comicvine.py
index 56618d4b..b4d8d34c 100644
--- a/cps/metadata_provider/comicvine.py
+++ b/cps/metadata_provider/comicvine.py
@@ -21,8 +21,11 @@ from typing import Dict, List, Optional
 from urllib.parse import quote
 
 import requests
+from cps import logger
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
 
 class ComicVine(Metadata):
     __name__ = "ComicVine"
@@ -46,10 +49,15 @@ class ComicVine(Metadata):
             if title_tokens:
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = "%20".join(tokens)
-            result = requests.get(
-                f"{ComicVine.BASE_URL}{query}{ComicVine.QUERY_PARAMS}",
-                headers=ComicVine.HEADERS,
-            )
+            try:
+                result = requests.get(
+                    f"{ComicVine.BASE_URL}{query}{ComicVine.QUERY_PARAMS}",
+                    headers=ComicVine.HEADERS,
+                )
+                result.raise_for_status()
+            except Exception as e:
+                log.warning(e)
+                return None
             for result in result.json()["results"]:
                 match = self._parse_search_result(
                     result=result, generic_cover=generic_cover, locale=locale
diff --git a/cps/metadata_provider/google.py b/cps/metadata_provider/google.py
index fbb68965..98fadd37 100644
--- a/cps/metadata_provider/google.py
+++ b/cps/metadata_provider/google.py
@@ -22,9 +22,12 @@ from urllib.parse import quote
 
 import requests
 
+from cps import logger
 from cps.isoLanguages import get_lang3, get_language_name
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
 
 class Google(Metadata):
     __name__ = "Google"
@@ -45,7 +48,12 @@ class Google(Metadata):
             if title_tokens:
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = "+".join(tokens)
-            results = requests.get(Google.SEARCH_URL + query)
+            try:
+                results = requests.get(Google.SEARCH_URL + query)
+                results.raise_for_status()
+            except Exception as e:
+                log.warning(e)
+                return None
             for result in results.json().get("items", []):
                 val.append(
                     self._parse_search_result(
diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 814a785e..e4abe9db 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -27,9 +27,12 @@ from html2text import HTML2Text
 from lxml.html import HtmlElement, fromstring, tostring
 from markdown2 import Markdown
 
+from cps import logger
 from cps.isoLanguages import get_language_name
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
 SYMBOLS_TO_TRANSLATE = (
     "öÖüÜóÓőŐúÚéÉáÁűŰíÍąĄćĆęĘłŁńŃóÓśŚźŹżŻ",
     "oOuUoOoOuUeEaAuUiIaAcCeElLnNoOsSzZzZ",
@@ -112,7 +115,12 @@ class LubimyCzytac(Metadata):
         self, query: str, generic_cover: str = "", locale: str = "en"
     ) -> Optional[List[MetaRecord]]:
         if self.active:
-            result = requests.get(self._prepare_query(title=query))
+            try:
+                result = requests.get(self._prepare_query(title=query))
+                result.raise_for_status()
+            except Exception as e:
+                log.warning(e)
+                return None
             root = fromstring(result.text)
             lc_parser = LubimyCzytacParser(root=root, metadata=self)
             matches = lc_parser.parse_search_results()
@@ -200,7 +208,12 @@ class LubimyCzytacParser:
     def parse_single_book(
         self, match: MetaRecord, generic_cover: str, locale: str
     ) -> MetaRecord:
-        response = requests.get(match.url)
+        try:
+            response = requests.get(match.url)
+            response.raise_for_status()
+        except Exception as e:
+            log.warning(e)
+            return None
         self.root = fromstring(response.text)
         match.cover = self._parse_cover(generic_cover=generic_cover)
         match.description = self._parse_description()
diff --git a/cps/metadata_provider/scholar.py b/cps/metadata_provider/scholar.py
index b0c10b66..7feb0ee9 100644
--- a/cps/metadata_provider/scholar.py
+++ b/cps/metadata_provider/scholar.py
@@ -28,8 +28,12 @@ try:
 except FakeUserAgentError:
     raise ImportError("No module named 'scholarly'")
 
+from cps import logger
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
 
+log = logger.create()
+
+
 class scholar(Metadata):
     __name__ = "Google Scholar"
     __id__ = "googlescholar"
@@ -44,7 +48,11 @@ class scholar(Metadata):
             if title_tokens:
                 tokens = [quote(t.encode("utf-8")) for t in title_tokens]
                 query = " ".join(tokens)
-            scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
+            try:
+                scholar_gen = itertools.islice(scholarly.search_pubs(query), 10)
+            except Exception as e:
+                log.warning(e)
+                return None
             for result in scholar_gen:
                 match = self._parse_search_result(
                     result=result, generic_cover="", locale=locale
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index d72273f6..d02667d5 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -130,6 +130,6 @@ def metadata_search():
                 if active.get(c.__id__, True)
             }
             for future in concurrent.futures.as_completed(meta):
-                data.extend([asdict(x) for x in future.result()])
+                data.extend([asdict(x) for x in future.result() if x])
     # log.info({'Time elapsed {}'.format(current_milli_time()-start)})
     return Response(json.dumps(data), mimetype="application/json")
diff --git a/cps/static/js/get_meta.js b/cps/static/js/get_meta.js
index 6db1a261..43a40fa6 100644
--- a/cps/static/js/get_meta.js
+++ b/cps/static/js/get_meta.js
@@ -92,14 +92,19 @@ $(function () {
                 data: {"query": keyword},
                 dataType: "json",
                 success: function success(data) {
-                    $("#meta-info").html("<ul id=\"book-list\" class=\"media-list\"></ul>");
-                    data.forEach(function(book) {
-                        var $book = $(templates.bookResult(book));
-                        $book.find("img").on("click", function () {
-                            populateForm(book);
+                    if (data.length) {
+                        $("#meta-info").html("<ul id=\"book-list\" class=\"media-list\"></ul>");
+                        data.forEach(function(book) {
+                            var $book = $(templates.bookResult(book));
+                            $book.find("img").on("click", function () {
+                                populateForm(book);
+                            });
+                            $("#book-list").append($book);
                         });
-                        $("#book-list").append($book);
-                    });
+                    }
+                    else {
+                        $("#meta-info").html("<p class=\"text-danger\">" + msg.no_result + "!</p>" + $("#meta-info")[0].innerHTML)
+                    }
                 },
                 error: function error() {
                     $("#meta-info").html("<p class=\"text-danger\">" + msg.search_error + "!</p>" + $("#meta-info")[0].innerHTML);

From 965352c8d96c9eae7a6867ff76b0db137d04b0b8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 26 Feb 2022 08:05:35 +0100
Subject: [PATCH 136/220] Don't allow redirects on cover uploads, catch more
 addresses which resolve to localhost

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

diff --git a/cps/helper.py b/cps/helper.py
index b5495930..c162f7ee 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -734,10 +734,10 @@ def save_cover_from_url(url, book_path):
         if not cli.allow_localhost:
             # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
             ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1":
+            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1" or ip == "0.0.0.0" or ip == "::":
                 log.error("Localhost was accessed for cover upload")
                 return False, _("You are not allowed to access localhost for cover uploads")
-        img = requests.get(url, timeout=(10, 200))      # ToDo: Error Handling
+        img = requests.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
         img.raise_for_status()
         return save_cover(img, book_path)
     except (socket.gaierror,

From 598618e4285d4450c74c9920941eef3242db880e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 1 Mar 2022 16:36:46 +0100
Subject: [PATCH 137/220] Fix rename_files_on_change return handling Updated
 test result

---
 cps/helper.py                           |   11 +-
 test/Calibre-Web TestSummary_Linux.html | 2491 ++++-------------------
 2 files changed, 350 insertions(+), 2152 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index c162f7ee..03a2d03b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -493,12 +493,10 @@ def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_d
                                title_dir + " (" + str(book_id) + ")")
     book.path = gdrive_path.replace("\\", "/")
     gd.uploadFileToEbooksFolder(os.path.join(gdrive_path, file_name).replace("\\", "/"), original_filepath)
-    error |= rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
-    return error
+    return rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
 
 
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
-    error = False
     book = calibre_db.get_book(book_id)
 
     authordir = book.path.split('/')[0]
@@ -513,7 +511,7 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             book.path = book.path.split('/')[0] + u'/' + new_titledir
             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
+            return _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
 
     if authordir != new_authordir and authordir not in renamed_author:
         gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
@@ -522,12 +520,11 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
             book.path = new_authordir + u'/' + book.path.split('/')[1]
             gd.updateDatabaseOnEdit(gFile['id'], book.path)
         else:
-            error = _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
+            return _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
 
     # change location in database to new author/title path
     book.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
-    error |= rename_files_on_change(first_author, renamed_author, book, gdrive=True)
-    return error
+    return rename_files_on_change(first_author, renamed_author, book, gdrive=True)
 
 
 def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, db_filename, original_filepath, path):
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index af8cfcd9..c569a45d 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-02-05 20:19:09</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-02-28 21:38:15</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>2022-02-06 00:20:42</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-01 01:36:56</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>3h 15 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 14 min</p>
         </div>
       </div>
       </div>
@@ -330,13 +330,13 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
         <td class="text-center">2</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">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c3', 2)">Detail</a>
         </td>
@@ -344,89 +344,20 @@
 
     
     
-        <tr id="et3.1" class="none bg-info">
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 179, in test_cli_gdrive_location
-    self.fill_db_config({&#39;config_google_drive_folder&#39;: &#39;test&#39;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 254, in fill_db_config
-    select = Select(cls.driver.find_element(By.ID, key))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_google_drive_folder&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et3.2" class="none bg-info">
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli_gdrive.py&#34;, line 144, in test_gdrive_db_nonwrite
-    self.fill_db_config({&#39;config_use_google_drive&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 250, in fill_db_config
-    ele.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementClickInterceptedException: Message: Element &lt;input id=&#34;config_use_google_drive&#34; name=&#34;config_use_google_drive&#34; type=&#34;checkbox&#34;&gt; is not clickable at point (473,225) because another element &lt;div id=&#34;GeneralChangeModal&#34; class=&#34;modal fade in&#34;&gt; obscures it
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementClickInterceptedError@chrome://remote/content/shared/webdriver/Errors.jsm:282:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:166:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1496,9 +1427,9 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 544, in test_rename_capital_on_upload
-    self.check_element_on_page((By.ID, &#39;edit_cancel&#39;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 579, in test_rename_capital_on_upload
+    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1713,9 +1644,9 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">20</td>
+        <td class="text-center">15</td>
+        <td class="text-center">3</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c16', 20)">Detail</a>
@@ -1724,31 +1655,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
 
     
     
-        <tr id="et16.1" class="none bg-info">
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 877, in test_download_book
-    self.assertEqual(len(list_element), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1770,77 +1681,9 @@ TypeError: object of type &#39;bool&#39; has no len()</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 291, in test_edit_author
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee201a90&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 392, in test_edit_author
+    self.assertEqual(values[&#39;author&#39;][0], &#39;Pipo, Pipe&#39;)
+IndexError: list index out of range</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1850,751 +1693,119 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.3" class="none bg-info">
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 471, in test_edit_category
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cee4aa5e0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.4" class="none bg-info">
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 638, in test_edit_comments
-    self.get_book_details(12)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.5" class="none bg-info">
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 653, in test_edit_custom_bool
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_3&#39;: u&#39;Yes&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.6" class="none bg-info">
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 722, in test_edit_custom_categories
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_6&#39;: u&#39;人 Ü&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.7" class="none bg-info">
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 740, in test_edit_custom_float
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_8&#39;: u&#39;-2.5&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.8" class="none bg-info">
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 756, in test_edit_custom_int
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_4&#39;: u&#39;0&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.9" class="none bg-info">
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 669, in test_edit_custom_rating
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_1&#39;: u&#39;3&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.10" class="none bg-info">
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 689, in test_edit_custom_single_select
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_9&#39;: u&#39;人物&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.11" class="none bg-info">
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 705, in test_edit_custom_text
-    self.assertEqual(len(self.adv_search({u&#39;custom_column_10&#39;: u&#39;人 Ä&#39;})), 0)
-TypeError: object of type &#39;bool&#39; has no len()</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.12" class="none bg-info">
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.12').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 580, in test_edit_language
-    self.get_book_details(3)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec226910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.13" class="none bg-info">
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.13').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 525, in test_edit_publisher
-    self.get_book_details(7)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec42c700&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.14" class="none bg-info">
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.14').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 610, in test_edit_rating
-    books = self.get_books_displayed()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1185, in get_books_displayed
-    html = cls.driver.page_source
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 926, in page_source
-    return self.execute(Command.GET_PAGE_SOURCE)[&#39;value&#39;]
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 74, in request
-    return self.request_encode_url(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 96, in request_encode_url
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/source (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec4790d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.15" class="none bg-info">
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.15').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 404, in test_edit_series
-    self.get_book_details(9)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1402, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 436, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c9520&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2616,77 +1827,9 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 133, in test_edit_title
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec623f40&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 183, in test_edit_title
+    self.assertEqual(&#39;Unknown&#39;, values[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2696,94 +1839,28 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.17" class="none bg-info">
+        <tr id="ft16.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.17')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.17')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et16.17" class="popup_window test_output" style="display:block;">
+                <div id="div_ft16.17" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.17').style.display='none'"><span
+                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 848, in test_upload_book_epub
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786370&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 865, in test_upload_book_epub
+    self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
+AssertionError: &#39;8936&#39; != &#39;1103&#39;
+- 8936
++ 1103</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2793,191 +1870,35 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.18" class="none bg-info">
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 823, in test_upload_book_lit
-    self.fill_basic_config({&#39;config_uploading&#39;:1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec786910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et16.19" class="none bg-info">
+        <tr id="ft16.19" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.19')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.19')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et16.19" class="popup_window test_output" style="display:block;">
+                <div id="div_ft16.19" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.19').style.display='none'"><span
+                                onclick="document.getElementById('div_ft16.19').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 771, in test_upload_cover_hdd
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cecfea310&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 778, in test_upload_cover_hdd
+    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
+AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2987,92 +1908,26 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id="et16.20" class="none bg-info">
+        <tr id="ft16.20" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.20')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.20')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et16.20" class="popup_window test_output" style="display:block;">
+                <div id="div_ft16.20" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.20').style.display='none'"><span
+                                onclick="document.getElementById('div_ft16.20').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 908, in test_watch_metadata
-    button = self.check_element_on_page((By.ID, &#34;enable_gdrive_watch&#34;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 707, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1244, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 422, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 421, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 443, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=51341): Max retries exceeded with url: /session/2d4e9139-cf96-4ca3-bca3-9646475259b3/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f7cec5c74c0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=cd72c8b1-57d4-4162-a993-661f44e62822&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3149,11 +2004,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">7</td>
-        <td class="text-center">0</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3181,11 +2036,31 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id="ft19.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</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_ft19.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft19.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 130, in test_SSL_logging_email
+    self.assertTrue(len(re.findall(&#39;subject: Calibre-Web test e-mail&#39;, data)),&#34;Email logging not working&#34;)
+AssertionError: 0 is not true : Email logging not working</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3343,13 +2218,13 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSetupGdrive</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c23', 1)">Detail</a>
         </td>
@@ -3357,31 +2232,11 @@ urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, p
 
     
     
-        <tr id="ft23.1" class="none bg-danger">
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft23.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft23.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft23.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_gdrive_setup.py&#34;, line 113, in test_config_gdrive
-    self.assertFalse(use_gdrive.is_selected())
-AssertionError: True is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4899,929 +3754,275 @@ AssertionError: True is not false</pre>
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestUploadEPubs</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 2)">Detail</a>
+            <a onclick="showClassDetail('c41', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id="et41.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
+                <div class='testcase'>setUpClass (test_upload_epubs)</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt41.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 28, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
+During handling of the above exception, another exception occurred:
 
-    <tr id="su" class="passClass">
-        <td>TestUserList</td>
-        <td class="text-center">18</td>
-        <td class="text-center">18</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('c42', 18)">Detail</a>
-        </td>
-    </tr>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 32, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.2" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_user_list)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 53, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#34;config_uploading&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
-    
-    
-        <tr id='pt42.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_edit_user_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_list_visibility</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_admin_role</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_check_sort</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_download_role</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_button</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_email</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_name</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_requests</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_search</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt42.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserList - test_user_list_sort</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
+During handling of the above exception, another exception occurred:
 
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 57, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.3" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_user_load)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 61, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_access_log&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
-    <tr id="su" class="passClass">
-        <td>TestUserLoad</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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('c43', 1)">Detail</a>
-        </td>
-    </tr>
+During handling of the above exception, another exception occurred:
 
-    
-    
-        <tr id='pt43.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserLoad - test_user_change_vis</div>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 65, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
+    
+        <tr id="et41.4" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_user_template)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 20, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
+During handling of the above exception, another exception occurred:
 
-    <tr id="su" class="passClass">
-        <td>TestUserTemplate</td>
-        <td class="text-center">21</td>
-        <td class="text-center">21</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('c44', 21)">Detail</a>
-        </td>
-    </tr>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 22, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et41.5" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_visiblilitys)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 25, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
+    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
+    return subprocess.Popen(exc_command,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
+    self._execute_child(args, executable, preexec_fn, close_fds,
+  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
+    raise child_exception_type(errno_num, err_msg, err_filename)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
 
-    
-    
-        <tr id='pt44.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_author_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_best_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_category_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_download_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_format_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_language_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_list_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_random_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_read_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.19' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.20' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_series_user_template</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.21' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
+During handling of the above exception, another exception occurred:
 
-
-    <tr id="su" class="passClass">
-        <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">34</td>
-        <td class="text-center">34</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('c45', 34)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt45.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 27, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id="et41.6" class="none bg-info">
             <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
+                <div class='testcase'>setUpClass (test_zz_helper)</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
+    from cps import helper, updater
+ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown location)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.18' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.19' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.20' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.21' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.22' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.23' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.24' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.25' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.26' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.27' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.28' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.29' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.30' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.31' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.32' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.33' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt45.34' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="passClass">
-        <td>TestCalibreHelper</td>
-        <td class="text-center">16</td>
-        <td class="text-center">16</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('c46', 16)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt46.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_random_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt46.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>404</td>
-        <td>373</td>
-        <td>1</td>
-        <td>23</td>
+        <td>318</td>
+        <td>298</td>
+        <td>4</td>
+        <td>9</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5850,7 +4051,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-28-generic #31~20.04.1-Ubuntu SMP Wed Jan 19 14:08:10 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-30-generic #33~20.04.1-Ubuntu SMP Mon Feb 7 14:25:10 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -5880,7 +4081,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Flask</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
@@ -5934,7 +4135,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>PyPDF3</th>
-              <td>1.0.5</td>
+              <td>1.0.6</td>
               <td>Basic</td>
             </tr>
           
@@ -5964,7 +4165,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.3.2</td>
+              <td>1.3.3</td>
               <td>Basic</td>
             </tr>
           
@@ -5976,13 +4177,13 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>Werkzeug</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -6012,7 +4213,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -6042,7 +4243,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -6084,7 +4285,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -6120,7 +4321,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -6162,7 +4363,7 @@ AssertionError: True is not false</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.38.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -6252,7 +4453,7 @@ AssertionError: True is not false</pre>
 </div>
 
 <script>
-    drawCircle(373, 1, 23, 7);
+    drawCircle(298, 4, 9, 7);
     showCase(5);
 </script>
 

From 153a443fca5e6a875c9d30f97eeecd7c9b99e4dd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Sun, 6 Mar 2022 14:02:06 +0100
Subject: [PATCH 138/220] Update setup config

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 12874151..5b8ce678 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -83,7 +83,7 @@ oauth =
 	Flask-Dance>=2.0.0,<5.2.0
 	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
-	rarfile>=2.7
+	rarfile>=3.2
 	scholarly>=1.2.0,<1.6
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1

From c53817859a0e46820a0a92bbd0697805f7e65445 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 6 Mar 2022 16:02:01 +0100
Subject: [PATCH 139/220] Version update Updated testresult

---
 SECURITY.md                             |    2 +
 cps/constants.py                        |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1226 +++++++++++++++++------
 3 files changed, 903 insertions(+), 327 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 262e66e2..26ce3c55 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -32,6 +32,8 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
 | V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
 | V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            ||
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
 
 
 ## Staement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index f9003125..a96f614b 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.17 Beta'}
+STABLE_VERSION = {'version': '0.6.17'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index c569a45d..5daf8267 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-02-28 21:38:15</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-02 20:56:18</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>2022-03-01 01:36:56</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-03 01:48:44</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>3h 14 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 5 min</p>
         </div>
       </div>
       </div>
@@ -1351,12 +1351,12 @@
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestEditAuthorsGdrive</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 6)">Detail</a>
@@ -1410,31 +1410,11 @@
     
     
     
-        <tr id="et13.6" class="none bg-info">
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et13.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 579, in test_rename_capital_on_upload
-    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1641,12 +1621,12 @@ KeyError: &#39;title&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">15</td>
+        <td class="text-center">17</td>
         <td class="text-center">3</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('c16', 20)">Detail</a>
@@ -1664,31 +1644,11 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 392, in test_edit_author
-    self.assertEqual(values[&#39;author&#39;][0], &#39;Pipo, Pipe&#39;)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1810,31 +1770,11 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id="et16.16" class="none bg-info">
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 183, in test_edit_title
-    self.assertEqual(&#39;Unknown&#39;, values[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1927,7 +1867,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=cd72c8b1-57d4-4162-a993-661f44e62822&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=22ded0fa-26b4-429d-81fc-bc75707c4e4c&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2004,11 +1944,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</td>
+        <td class="text-center">7</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2036,31 +1976,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="ft19.3" class="none bg-danger">
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 130, in test_SSL_logging_email
-    self.assertTrue(len(re.findall(&#39;subject: Calibre-Web test e-mail&#39;, data)),&#34;Email logging not working&#34;)
-AssertionError: 0 is not true : Email logging not working</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3754,275 +3674,929 @@ AssertionError: 0 is not true : Email logging not working</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">6</td>
+    <tr id="su" class="passClass">
+        <td>TestUploadEPubs</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">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 6)">Detail</a>
+            <a onclick="showClassDetail('c41', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et41.1" class="none bg-info">
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_upload_epubs)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 28, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 32, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.2" class="none bg-info">
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_user_list)</div>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 53, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#34;config_uploading&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
-During handling of the above exception, another exception occurred:
 
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 57, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+    <tr id="su" class="passClass">
+        <td>TestUserList</td>
+        <td class="text-center">18</td>
+        <td class="text-center">18</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('c42', 18)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt42.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.3" class="none bg-info">
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_user_load)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 61, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB, &#39;config_access_log&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_load.py&#34;, line 65, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.4" class="none bg-info">
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_user_template)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 20, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_user_template.py&#34;, line 22, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.5" class="none bg-info">
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_visiblilitys)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 25, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 173, in startup
-    inst.p = process_open(command, [1], sout=None, env=env, cwd=work_path)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/subproc_wrapper.py&#34;, line 28, in process_open
-    return subprocess.Popen(exc_command,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 858, in __init__
-    self._execute_child(args, executable, preexec_fn, close_fds,
-  File &#34;/usr/lib/python3.8/subprocess.py&#34;, line 1704, in _execute_child
-    raise child_exception_type(errno_num, err_msg, err_filename)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;/home/ozzie/Development/calibre-web/venv/bin/python3&#39;
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 27, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+                <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et41.6" class="none bg-info">
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_zz_helper)</div>
+                <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
-    from cps import helper, updater
-ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown location)</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_button</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_name</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_requests</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_search</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt42.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserList - test_user_list_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestUserLoad</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c43', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt43.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserLoad - test_user_change_vis</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestUserTemplate</td>
+        <td class="text-center">21</td>
+        <td class="text-center">21</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('c44', 21)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt44.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_author_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_best_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_category_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_download_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_format_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_language_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_list_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_random_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_read_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_series_user_template</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestCalibreWebVisibilitys</td>
+        <td class="text-center">34</td>
+        <td class="text-center">34</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('c45', 34)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt45.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.17' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.18' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.19' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.20' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.21' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.22' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.23' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.24' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.25' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.27' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.28' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.29' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.30' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.31' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.32' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.33' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt45.34' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestCalibreHelper</td>
+        <td class="text-center">16</td>
+        <td class="text-center">16</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('c46', 16)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt46.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_random_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt46.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>318</td>
-        <td>298</td>
-        <td>4</td>
-        <td>9</td>
+        <td>404</td>
+        <td>394</td>
+        <td>3</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -4183,7 +4757,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4213,7 +4787,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4243,7 +4817,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4285,7 +4859,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4321,7 +4895,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4363,7 +4937,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.38.0</td>
+              <td>2.39.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4453,7 +5027,7 @@ ImportError: cannot import name &#39;helper&#39; from &#39;cps&#39; (unknown loc
 </div>
 
 <script>
-    drawCircle(298, 4, 9, 7);
+    drawCircle(394, 3, 0, 7);
     showCase(5);
 </script>
 

From 753319c8b63df34db9dfdf2e1078950070d410f3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Sun, 6 Mar 2022 16:30:50 +0100
Subject: [PATCH 140/220] Version bump

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

diff --git a/cps/constants.py b/cps/constants.py
index a96f614b..cb5348d5 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.17'}
+STABLE_VERSION = {'version': '0.6.18 Beta'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'

From 34478079d83755ce843ba200638717929ecc3010 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 9 Mar 2022 14:45:39 +0100
Subject: [PATCH 141/220] Prevent local variable 'from_book' referenced before
 assignment during merge of books Merge books source book: Each book in own
 row Merge books, sources are deleted before dialog shows up again

---
 cps/editbooks.py       | 2 +-
 cps/static/js/table.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index fcf043a5..483e8a7e 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1263,8 +1263,8 @@ def simulate_merge_list_book():
         to_book = calibre_db.get_book(vals[0]).title
         vals.pop(0)
         if to_book:
+            from_book = []
             for book_id in vals:
-                from_book = []
                 from_book.append(calibre_db.get_book(book_id).title)
             return json.dumps({'to': to_book, 'from': from_book})
     return ""
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index dce1d06c..ae8c591b 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -107,8 +107,9 @@ $(function() {
             url: window.location.pathname + "/../ajax/simulatemerge",
             data: JSON.stringify({"Merge_books":selections}),
             success: function success(booTitles) {
+                $('#merge_from').empty();
                 $.each(booTitles.from, function(i, item) {
-                    $("<span>- " + item + "</span>").appendTo("#merge_from");
+                    $("<span>- " + item + "</span><p></p>").appendTo("#merge_from");
                 });
                 $("#merge_to").text("- " + booTitles.to);
 

From b54a170a00f3b5ecf4d4e2888db7f092522ba552 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Sat, 12 Mar 2022 13:54:37 +0800
Subject: [PATCH 142/220] Add clean_date method in douban metadata_provider

---
 cps/metadata_provider/douban.py | 37 ++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/cps/metadata_provider/douban.py b/cps/metadata_provider/douban.py
index 5eda21ec..ee21f587 100644
--- a/cps/metadata_provider/douban.py
+++ b/cps/metadata_provider/douban.py
@@ -88,7 +88,7 @@ class Douban(Metadata):
 
             results = r.json()
             if results["total"] == 0:
-                return val
+                return []
 
             book_id_list = [
                 self.ID_PATTERN.search(item).group("id")
@@ -139,7 +139,7 @@ class Douban(Metadata):
         match.cover = html.xpath(self.COVER_XPATH)[0].attrib["href"] or generic_cover
         try:
             rating_num = float(html.xpath(self.RATING_XPATH)[0].text.strip())
-        except ValueError:
+        except Exception:
             rating_num = 0
         match.rating = int(-1 * rating_num // 2 * -1) if rating_num else 0
 
@@ -166,10 +166,41 @@ class Douban(Metadata):
             elif self.SUBTITLE_PATTERN.search(text):
                 match.title = f'{match.title}:' + element.tail.strip()
             elif self.PUBLISHED_DATE_PATTERN.search(text):
-                match.publishedDate = element.tail.strip()
+                match.publishedDate = self._clean_date(element.tail.strip())
             elif self.SUBTITLE_PATTERN.search(text):
                 match.series = element.getnext().text
             elif i_type := self.IDENTIFIERS_PATTERN.search(text):
                 match.identifiers[i_type.group()] = element.tail.strip()
 
         return match
+
+    
+    def _clean_date(self, date: str) -> str:
+        """
+        Clean up the date string to be in the format YYYY-MM-DD
+
+        Examples of possible patterns:
+            '2014-7-16', '1988年4月', '1995-04', '2021-8', '2020-12-1', '1996年',
+            '1972', '2004/11/01', '1959年3月北京第1版第1印'
+        """
+        year = date[:4]
+        moon = "01"
+        day = "01"
+
+        if len(date) > 5:
+            digit = []
+            ls = []
+            for i in range(5, len(date)):
+                if date[i].isdigit():
+                    digit.append(date[i])
+                elif digit:
+                    ls.append("".join(digit) if len(digit)==2 else f"0{digit[0]}")
+                    digit = []
+            if digit:
+                ls.append("".join(digit) if len(digit)==2 else f"0{digit[0]}")
+
+            moon = ls[0]
+            if len(ls)>1:
+                day = ls[1]     
+
+        return f"{year}-{moon}-{day}"

From 49692b4a454f762edbefc6642dfb0f50b75418e6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 08:27:18 +0100
Subject: [PATCH 143/220] Update catch errors for load metadata from amazon
 (#2333)

---
 cps/metadata_provider/amazon.py | 62 +++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index 558edebc..acea7e07 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -25,8 +25,11 @@ try:
 except ImportError:
     pass
 from cps.services.Metadata import MetaRecord, MetaSourceInfo, Metadata
+import cps.logger as logger
+
 #from time import time
 from operator import itemgetter
+log = logger.create()
 
 class Amazon(Metadata):
     __name__ = "Amazon"
@@ -48,15 +51,15 @@ class Amazon(Metadata):
         self, query: str, generic_cover: str = "", locale: str = "en"
     ):
         #timer=time()
-        def inner(link,index)->[dict,int]:
-             with self.session as session:
-                r = session.get(f"https://www.amazon.com/{link}")
-                r.raise_for_status()
-                long_soup = BS(r.text, "lxml")  #~4sec :/
-                soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
-                if soup2 is None:
-                    return
-                try:
+        def inner(link, index) -> [dict, int]:
+            try:
+                with self.session as session:
+                    r = session.get(f"https://www.amazon.com{link}")
+                    r.raise_for_status()
+                    long_soup = BS(r.text, "lxml")  #~4sec :/
+                    soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
+                    if soup2 is None:
+                        return
                     match = MetaRecord(
                         title = "",
                         authors = "",
@@ -65,7 +68,7 @@ class Amazon(Metadata):
                             description="Amazon Books",
                             link="https://amazon.com/"
                         ),
-                        url = f"https://www.amazon.com/{link}",
+                        url = f"https://www.amazon.com{link}",
                         #the more searches the slower, these are too hard to find in reasonable time or might not even exist
                         publisher= "",  # very unreliable
                         publishedDate= "",  # very unreliable
@@ -101,22 +104,27 @@ class Amazon(Metadata):
                     except (AttributeError, TypeError):
                         match.cover = ""
                     return match, index
-                except Exception as e:
-                    print(e)
-                    return
+            except Exception as e:
+                log.debug_or_exception(e)
+                return
 
         val = list()
-        if self.active:
-            results = self.session.get(
-                f"https://www.amazon.com/s?k={query.replace(' ', '+')}&i=digital-text&sprefix={query.replace(' ', '+')}"
-                f"%2Cdigital-text&ref=nb_sb_noss",
-                headers=self.headers)
-            results.raise_for_status()
-            soup = BS(results.text, 'html.parser')
-            links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
-                          soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
-            with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
-                fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
-                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
-        result=list(filter(lambda x: x, val))
-        return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
+        try:
+            if self.active:
+                results = self.session.get(
+                    f"https://www.amazon.com/s?k={query.replace(' ', '+')}"
+                    f"&i=digital-text&sprefix={query.replace(' ', '+')}"
+                    f"%2Cdigital-text&ref=nb_sb_noss",
+                    headers=self.headers)
+                results.raise_for_status()
+                soup = BS(results.text, 'html.parser')
+                links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
+                              soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
+                with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+                    fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
+                    val = list(map(lambda x: x.result(), concurrent.futures.as_completed(fut)))
+            result = list(filter(lambda x: x, val))
+            return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
+        except requests.exceptions.HTTPError as e:
+            log.debug_or_exception(e)
+            return []

From d80297e1a87523adc2b5731695cd91f06b265ae6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 10:00:38 +0100
Subject: [PATCH 144/220] Bugfix sorting user table

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

diff --git a/cps/admin.py b/cps/admin.py
index 4876d421..18bd87ec 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -298,10 +298,13 @@ def list_users():
     limit = int(request.args.get("limit") or 10)
     search = request.args.get("search")
     sort = request.args.get("sort", "id")
-    order = request.args.get("order", "").lower()
     state = None
     if sort == "state":
         state = json.loads(request.args.get("state", "[]"))
+    else:
+        if sort not in ub.User.__table__.columns.keys():
+            sort = "id"
+    order = request.args.get("order", "").lower()
 
     if sort != "state" and order:
         order = text(sort + " " + order)

From 547ea93dc9b8cace6383374d66da1b51de64342d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 10:19:21 +0100
Subject: [PATCH 145/220] First fix for #2325 (edit book table with readonly
 database)

---
 cps/editbooks.py | 152 ++++++++++++++++++++++++-----------------------
 1 file changed, 78 insertions(+), 74 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 483e8a7e..7e251696 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1152,80 +1152,81 @@ def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
     # ret = ""
-    if param == 'series_index':
-        edit_book_series_index(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
-    elif param == 'tags':
-        edit_book_tags(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
-                       mimetype='application/json')
-    elif param == 'series':
-        edit_book_series(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
-                       mimetype='application/json')
-    elif param == 'publishers':
-        edit_book_publisher(vals['value'], book)
-        ret = Response(json.dumps({'success': True,
-                                    'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
-                       mimetype='application/json')
-    elif param == 'languages':
-        invalid = list()
-        edit_book_languages(vals['value'], book, invalid=invalid)
-        if invalid:
-            ret = Response(json.dumps({'success': False,
-                                       'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
-                           mimetype='application/json')
-        else:
-            lang_names = list()
-            for lang in book.languages:
-                lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
-            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
-                            mimetype='application/json')
-    elif param == 'author_sort':
-        book.author_sort = vals['value']
-        ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
-                       mimetype='application/json')
-    elif param == 'title':
-        sort = book.sort
-        handle_title_on_edit(book, vals.get('value', ""))
-        helper.update_dir_structure(book.id, config.config_calibre_dir)
-        ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
-                       mimetype='application/json')
-    elif param == 'sort':
-        book.sort = vals['value']
-        ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
-                       mimetype='application/json')
-    elif param == 'comments':
-        edit_book_comments(vals['value'], book)
-        ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
-                       mimetype='application/json')
-    elif param == 'authors':
-        input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
-        helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
-        ret = Response(json.dumps({'success': True,
-                                   'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
-                       mimetype='application/json')
-    elif param == 'is_archived':
-        change_archived_books(book.id, vals['value'] == "True")
-        ret = ""
-    elif param == 'read_status':
-        ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
-        if ret:
-            return ret, 400
-    elif param.startswith("custom_column_"):
-        new_val = dict()
-        new_val[param] = vals['value']
-        edit_single_cc_data(book.id, book, param[14:], new_val)
-        # ToDo: Very hacky find better solution
-        if vals['value'] in ["True", "False"]:
-            ret = ""
-        else:
-            ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                           mimetype='application/json')
-    else:
-        return _("Parameter not found"), 400
-    book.last_modified = datetime.utcnow()
     try:
+        if param == 'series_index':
+            edit_book_series_index(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
+        elif param == 'tags':
+            edit_book_tags(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
+                           mimetype='application/json')
+        elif param == 'series':
+            edit_book_series(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
+                           mimetype='application/json')
+        elif param == 'publishers':
+            edit_book_publisher(vals['value'], book)
+            ret = Response(json.dumps({'success': True,
+                                        'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+                           mimetype='application/json')
+        elif param == 'languages':
+            invalid = list()
+            edit_book_languages(vals['value'], book, invalid=invalid)
+            if invalid:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
+                               mimetype='application/json')
+            else:
+                lang_names = list()
+                for lang in book.languages:
+                    lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
+                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+                                mimetype='application/json')
+        elif param == 'author_sort':
+            book.author_sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
+                           mimetype='application/json')
+        elif param == 'title':
+            sort = book.sort
+            handle_title_on_edit(book, vals.get('value', ""))
+            helper.update_dir_structure(book.id, config.config_calibre_dir)
+            ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+                           mimetype='application/json')
+        elif param == 'sort':
+            book.sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
+                           mimetype='application/json')
+        elif param == 'comments':
+            edit_book_comments(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
+                           mimetype='application/json')
+        elif param == 'authors':
+            input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
+            helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
+            ret = Response(json.dumps({'success': True,
+                                       'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
+                           mimetype='application/json')
+        elif param == 'is_archived':
+            change_archived_books(book.id, vals['value'] == "True")
+            ret = ""
+        elif param == 'read_status':
+            ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
+            if ret:
+                return ret, 400
+        elif param.startswith("custom_column_"):
+            new_val = dict()
+            new_val[param] = vals['value']
+            edit_single_cc_data(book.id, book, param[14:], new_val)
+            # ToDo: Very hacky find better solution
+            if vals['value'] in ["True", "False"]:
+                ret = ""
+            else:
+                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                               mimetype='application/json')
+        else:
+            return _("Parameter not found"), 400
+        book.last_modified = datetime.utcnow()
+
         calibre_db.session.commit()
         # revert change for sort if automatic fields link is deactivated
         if param == 'title' and vals.get('checkT') == "false":
@@ -1233,7 +1234,10 @@ def edit_list_book(param):
             calibre_db.session.commit()
     except (OperationalError, IntegrityError) as e:
         calibre_db.session.rollback()
-        log.error("Database error: %s", e)
+        log.error("Database error: {}".format(e))
+        ret = Response(json.dumps({'success': False,
+                                   'msg': 'Database error: {}'.format(e.orig)}),
+                       mimetype='application/json')
     return ret
 
 

From 3a0dacc6a69d3d7edf4abc362d1052f55b0330a3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 14:27:41 +0100
Subject: [PATCH 146/220] log message on not found author

---
 cps/db.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cps/db.py b/cps/db.py
index a3b93d89..caf0ee6e 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -788,8 +788,9 @@ class CalibreDB():
             error = False
             for auth in sort_authors:
                 results = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).all()
-                # ToDo: How to handle not found authorname
+                # ToDo: How to handle not found author name
                 if not len(results):
+                    log.error("Author {} not found to display name in right order".format(auth))
                     error = True
                     break
                 for r in results:

From 2b31b6a306407f049b5e58daaf8a186ba53eea93 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 16:51:50 +0100
Subject: [PATCH 147/220] Fix for #2325 (author sort order differs from authors
 order with readonly database)

---
 cps/db.py                    | 25 +++++++----
 cps/templates/author.html    |  4 +-
 cps/templates/detail.html    |  2 +-
 cps/templates/discover.html  |  2 +-
 cps/templates/index.html     |  4 +-
 cps/templates/listenmp3.html |  2 +-
 cps/templates/shelf.html     |  2 +-
 cps/templates/shelfdown.html |  2 +-
 cps/web.py                   | 80 ++++++++++++++++++------------------
 9 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index caf0ee6e..6ff0d03e 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -17,7 +17,7 @@
 #  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 sys
+import copy
 import os
 import re
 import ast
@@ -776,6 +776,8 @@ class CalibreDB():
 
     # Orders all Authors in the list according to authors sort
     def order_authors(self, entries, list_return=False, combined=False):
+        # entries_copy = copy.deepcopy(entries)
+        # entries_copy =[]
         for entry in entries:
             if combined:
                 sort_authors = entry.Books.author_sort.split('&')
@@ -785,26 +787,31 @@ class CalibreDB():
                 sort_authors = entry.author_sort.split('&')
                 ids = [a.id for a in entry.authors]
             authors_ordered = list()
-            error = False
+            # error = False
             for auth in sort_authors:
                 results = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).all()
                 # ToDo: How to handle not found author name
                 if not len(results):
                     log.error("Author {} not found to display name in right order".format(auth))
-                    error = True
+                    # error = True
                     break
                 for r in results:
                     if r.id in ids:
                         authors_ordered.append(r)
-            if not error:
+                        ids.remove(r.id)
+            for author_id in ids:
+                result = self.session.query(Authors).filter(Authors.id == author_id).first()
+                authors_ordered.append(result)
+
+            if list_return:
                 if combined:
                     entry.Books.authors = authors_ordered
                 else:
-                    entry.authors = authors_ordered
-        if list_return:
-            return entries
-        else:
-            return authors_ordered
+                    entry.ordered_authors = authors_ordered
+            else:
+                return authors_ordered
+        return entries
+
 
     def get_typeahead(self, database, query, replace=('', ''), tag_filter=true()):
         query = query or ''
diff --git a/cps/templates/author.html b/cps/templates/author.html
index d832ad5c..fc811368 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -47,7 +47,7 @@
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -110,7 +110,7 @@
       <div class="meta">
         <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
-		  {% for author in entry.authors %}
+		  {% for author in entry.ordered_authors %}
 			{% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
 				<a class="author-name author-hidden" href="https://www.goodreads.com/author/show/{{ author.gid }}" target="_blank" rel="noopener">{{author.name.replace('|',',')}}</a>
 				{% if loop.last %}
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 06357ce8..c2153db8 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -99,7 +99,7 @@
       </div>
       <h2 id="title">{{entry.title}}</h2>
       <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             <a href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id ) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 74448b98..bceb6a8a 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -20,7 +20,7 @@
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 162adc7d..b69a9284 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -19,7 +19,7 @@
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -101,7 +101,7 @@
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 279ec28f..7da62a20 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -105,7 +105,7 @@
 
   <div class="sm2-playlist-wrapper">
     <ul class="sm2-playlist-bd">
-      <li><a href="{{ url_for('web.serve_book', book_id=mp3file,book_format=audioformat)}}"><b>{% for author in entry.authors %}{{author.name.replace('|',',')}}
+      <li><a href="{{ url_for('web.serve_book', book_id=mp3file,book_format=audioformat)}}"><b>{% for author in entry.ordered_authors %}{{author.name.replace('|',',')}}
         {% if not loop.last %} & {% endif %} {% endfor %}</b> - {{entry.title}}</a></li>
     </ul>
   </div>
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index adfead60..2e4cf906 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -44,7 +44,7 @@
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 1d781310..78f00b5e 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -37,7 +37,7 @@
       <div class="meta">
         <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
-          {% for author in entry.authors %}
+          {% for author in entry.ordered_authors %}
             <a href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
diff --git a/cps/web.py b/cps/web.py
index 6d33f809..94f511b1 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -300,43 +300,43 @@ def get_matching_tags():
     return json_dumps
 
 
-def get_sort_function(sort, data):
+def get_sort_function(sort_param, data):
     order = [db.Books.timestamp.desc()]
-    if sort == 'stored':
-        sort = current_user.get_view_property(data, 'stored')
+    if sort_param == 'stored':
+        sort_param = current_user.get_view_property(data, 'stored')
     else:
-        current_user.set_view_property(data, 'stored', sort)
-    if sort == 'pubnew':
+        current_user.set_view_property(data, 'stored', sort_param)
+    if sort_param == 'pubnew':
         order = [db.Books.pubdate.desc()]
-    if sort == 'pubold':
+    if sort_param == 'pubold':
         order = [db.Books.pubdate]
-    if sort == 'abc':
+    if sort_param == 'abc':
         order = [db.Books.sort]
-    if sort == 'zyx':
+    if sort_param == 'zyx':
         order = [db.Books.sort.desc()]
-    if sort == 'new':
+    if sort_param == 'new':
         order = [db.Books.timestamp.desc()]
-    if sort == 'old':
+    if sort_param == 'old':
         order = [db.Books.timestamp]
-    if sort == 'authaz':
+    if sort_param == 'authaz':
         order = [db.Books.author_sort.asc(), db.Series.name, db.Books.series_index]
-    if sort == 'authza':
+    if sort_param == 'authza':
         order = [db.Books.author_sort.desc(), db.Series.name.desc(), db.Books.series_index.desc()]
-    if sort == 'seriesasc':
+    if sort_param == 'seriesasc':
         order = [db.Books.series_index.asc()]
-    if sort == 'seriesdesc':
+    if sort_param == 'seriesdesc':
         order = [db.Books.series_index.desc()]
-    if sort == 'hotdesc':
+    if sort_param == 'hotdesc':
         order = [func.count(ub.Downloads.book_id).desc()]
-    if sort == 'hotasc':
+    if sort_param == 'hotasc':
         order = [func.count(ub.Downloads.book_id).asc()]
-    if sort is None:
-        sort = "new"
-    return order, sort
+    if sort_param is None:
+        sort_param = "new"
+    return order, sort_param
 
 
-def render_books_list(data, sort, book_id, page):
-    order = get_sort_function(sort, data)
+def render_books_list(data, sort_param, book_id, page):
+    order = get_sort_function(sort_param, data)
     if data == "rated":
         return render_rated_books(page, book_id, order=order)
     elif data == "discover":
@@ -604,7 +604,7 @@ def render_language_books(page, name, order):
 
 
 def render_read_books(page, are_read, as_xml=False, order=None):
-    sort = order[0] if order else []
+    sort_param = order[0] if order else []
     if not config.config_read_column:
         if are_read:
             db_filter = and_(ub.ReadBook.user_id == int(current_user.id),
@@ -614,7 +614,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db_filter,
-                                                                sort,
+                                                                sort_param,
                                                                 False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
@@ -629,7 +629,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                     db.Books,
                                                                     db_filter,
-                                                                    sort,
+                                                                    sort_param,
                                                                     False, 0,
                                                                     db.books_series_link,
                                                                     db.Books.id == db.books_series_link.c.book,
@@ -656,8 +656,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                                      title=name, page=pagename, order=order[1])
 
 
-def render_archived_books(page, sort):
-    order = sort[0] or []
+def render_archived_books(page, sort_param):
+    order = sort_param[0] or []
     archived_books = (
         ub.session.query(ub.ArchivedBook)
         .filter(ub.ArchivedBook.user_id == int(current_user.id))
@@ -678,7 +678,7 @@ def render_archived_books(page, sort):
     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, order=sort[1])
+                                 title=name, page=pagename, order=sort_param[1])
 
 
 def render_prepare_search_form(cc):
@@ -767,32 +767,32 @@ def list_books():
     off = int(request.args.get("offset") or 0)
     limit = int(request.args.get("limit") or config.config_books_per_page)
     search = request.args.get("search")
-    sort = request.args.get("sort", "id")
+    sort_param = request.args.get("sort", "id")
     order = request.args.get("order", "").lower()
     state = None
     join = tuple()
 
-    if sort == "state":
+    if sort_param == "state":
         state = json.loads(request.args.get("state", "[]"))
-    elif sort == "tags":
+    elif sort_param == "tags":
         order = [db.Tags.name.asc()] if order == "asc" else [db.Tags.name.desc()]
         join = db.books_tags_link, db.Books.id == db.books_tags_link.c.book, db.Tags
-    elif sort == "series":
+    elif sort_param == "series":
         order = [db.Series.name.asc()] if order == "asc" else [db.Series.name.desc()]
         join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
-    elif sort == "publishers":
+    elif sort_param == "publishers":
         order = [db.Publishers.name.asc()] if order == "asc" else [db.Publishers.name.desc()]
         join = db.books_publishers_link, db.Books.id == db.books_publishers_link.c.book, db.Publishers
-    elif sort == "authors":
+    elif sort_param == "authors":
         order = [db.Authors.name.asc(), db.Series.name, db.Books.series_index] if order == "asc" \
             else [db.Authors.name.desc(), db.Series.name.desc(), db.Books.series_index.desc()]
         join = db.books_authors_link, db.Books.id == db.books_authors_link.c.book, db.Authors, \
                db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
-    elif sort == "languages":
+    elif sort_param == "languages":
         order = [db.Languages.lang_code.asc()] if order == "asc" else [db.Languages.lang_code.desc()]
         join = db.books_languages_link, db.Books.id == db.books_languages_link.c.book, db.Languages
-    elif order and sort in ["sort", "title", "authors_sort", "series_index"]:
-        order = [text(sort + " " + order)]
+    elif order and sort_param in ["sort", "title", "authors_sort", "series_index"]:
+        order = [text(sort_param + " " + order)]
     elif not state:
         order = [db.Books.timestamp.desc()]
 
@@ -817,7 +817,7 @@ def list_books():
                 except (KeyError, AttributeError):
                     log.error("Custom Column No.%d is not existing in calibre database", read_column)
                     # Skip linking read column and return None instead of read status
-                    books =calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
+                    books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
             books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
                                                           int(current_user.id) == ub.ArchivedBook.user_id))
                      .filter(calibre_db.common_filters(allow_show_archived=True)).all())
@@ -1263,7 +1263,7 @@ def extend_search_term(searchterm,
 
 
 def render_adv_search_results(term, offset=None, order=None, limit=None):
-    sort = order[0] if order else [db.Books.sort]
+    sort_param = order[0] if order else [db.Books.sort]
     pagination = None
 
     cc = get_cc_columns(filter_config_custom_read=True)
@@ -1378,7 +1378,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             log.debug_or_exception(ex)
             flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
 
-    q = q.order_by(*sort).all()
+    q = q.order_by(*sort_param).all()
     flask_session['query'] = json.dumps(term)
     ub.store_combo_ids(q)
     result_count = len(q)
@@ -1792,7 +1792,7 @@ def show_book(book_id):
 
         entry.tags = sort(entry.tags, key=lambda tag: tag.name)
 
-        entry.authors = calibre_db.order_authors([entry])
+        entry.ordered_authors = calibre_db.order_authors([entry])
 
         entry.kindle_list = check_send_to_kindle(entry)
         entry.reader_list = check_read_formats(entry)

From 4379669cf89b440ecd83d562966d290d9a6ac9b3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 17:14:54 +0100
Subject: [PATCH 148/220] Database error is more detailed renamed
 debug_or_exception to error_or_exception

---
 cps/admin.py                    | 34 ++++++++++++-------------
 cps/db.py                       |  8 +++---
 cps/editbooks.py                | 23 ++++++++++-------
 cps/gdrive.py                   |  2 +-
 cps/gdriveutils.py              |  2 +-
 cps/helper.py                   |  4 +--
 cps/logger.py                   |  2 +-
 cps/metadata_provider/amazon.py |  4 +--
 cps/oauth_bb.py                 |  4 +--
 cps/services/worker.py          |  2 +-
 cps/shelf.py                    | 44 ++++++++++++++++-----------------
 cps/tasks/mail.py               | 10 ++++----
 cps/ub.py                       |  2 +-
 cps/updater.py                  |  2 +-
 cps/web.py                      |  4 +--
 15 files changed, 76 insertions(+), 71 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 18bd87ec..60a674e8 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1216,10 +1216,10 @@ def _db_configuration_update_helper():
 
         # gdrive_error drive setup
         gdrive_error = _configuration_gdrive_helper(to_save)
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        _db_configuration_result(_("Settings DB is not Writeable"), gdrive_error)
+        log.error_or_exception("Settings Database error: {}".format(e))
+        _db_configuration_result(_(u"Database error: %(error)s.", error=e.orig), gdrive_error)
     try:
         metadata_db = os.path.join(to_save['config_calibre_dir'], "metadata.db")
         if config.config_use_google_drive and is_gdrive_ready() and not os.path.exists(metadata_db):
@@ -1332,10 +1332,10 @@ def _configuration_update_helper():
             unrar_status = helper.check_unrar(config.config_rarfile_location)
             if unrar_status:
                 return _configuration_result(unrar_status)
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        _configuration_result(_("Settings DB is not Writeable"))
+        log.error_or_exception("Settings Database error: {}".format(e))
+        _configuration_result(_(u"Database error: %(error)s.", error=e.orig))
 
     config.save()
     if reboot_required:
@@ -1430,10 +1430,10 @@ def _handle_new_user(to_save, content, languages, translations, kobo_support):
         ub.session.rollback()
         log.error("Found an existing account for {} or {}".format(content.name, content.email))
         flash(_("Found an existing account for this e-mail address or name."), category="error")
-    except OperationalError:
+    except OperationalError as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
 
 
 def _delete_user(content):
@@ -1547,10 +1547,10 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
         ub.session.rollback()
         log.error("An unknown error occurred while changing user: {}".format(str(ex)))
         flash(_(u"An unknown error occurred. Please try again later."), category="error")
-    except OperationalError:
+    except OperationalError as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
     return ""
 
 
@@ -1616,10 +1616,10 @@ def update_mailsettings():
         _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
     try:
         config.save()
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
         return edit_mailsettings()
 
     if to_save.get("test"):
@@ -1851,7 +1851,7 @@ def import_ldap_users():
     try:
         new_users = services.ldap.get_group_members(config.config_ldap_group_name)
     except (services.ldap.LDAPException, TypeError, AttributeError, KeyError) as e:
-        log.debug_or_exception(e)
+        log.error_or_exception(e)
         showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
         return json.dumps(showtext)
     if not new_users:
@@ -1879,7 +1879,7 @@ def import_ldap_users():
         try:
             user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
         except AttributeError as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             continue
         if user_data:
             user_count, message = ldap_import_create_user(user, user_data)
diff --git a/cps/db.py b/cps/db.py
index 6ff0d03e..2292614c 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -597,7 +597,7 @@ class CalibreDB():
                 cc = conn.execute(text("SELECT id, datatype FROM custom_columns"))
                 cls.setup_db_cc_classes(cc)
             except OperationalError as e:
-                log.debug_or_exception(e)
+                log.error_or_exception(e)
 
         cls.session_factory = scoped_session(sessionmaker(autocommit=False,
                                                           autoflush=True,
@@ -769,7 +769,7 @@ class CalibreDB():
                                     len(query.all()))
             entries = query.order_by(*order).offset(off).limit(pagesize).all()
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
         # display authors in right order
         entries = self.order_authors(entries, True, join_archive_read)
         return entries, randm, pagination
@@ -792,7 +792,7 @@ class CalibreDB():
                 results = self.session.query(Authors).filter(Authors.sort == auth.lstrip().strip()).all()
                 # ToDo: How to handle not found author name
                 if not len(results):
-                    log.error("Author {} not found to display name in right order".format(auth))
+                    log.error("Author {} not found to display name in right order".format(auth.strip()))
                     # error = True
                     break
                 for r in results:
@@ -974,5 +974,5 @@ def lcase(s):
         return unidecode.unidecode(s.lower())
     except Exception as ex:
         log = logger.create()
-        log.debug_or_exception(ex)
+        log.error_or_exception(ex)
         return s.lower()
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 7e251696..3a08f061 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -337,7 +337,7 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
                         kobo_sync_status.remove_synced_book(book.id, True)
                 calibre_db.session.commit()
             except Exception as ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 calibre_db.session.rollback()
                 if jsonResponse:
                     return json.dumps([{"location": url_for("editbook.edit_book", book_id=book_id),
@@ -663,8 +663,8 @@ def upload_single_file(request, book, book_id):
                     calibre_db.update_title_sort(config)
                 except (OperationalError, IntegrityError) as e:
                     calibre_db.session.rollback()
-                    log.error('Database error: %s', e)
-                    flash(_(u"Database error: %(error)s.", error=e), category="error")
+                    log.error_or_exception("Database error: {}".format(e))
+                    flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
                     return redirect(url_for('web.show_book', book_id=book.id))
 
             # Queue uploader info
@@ -756,7 +756,7 @@ def edit_book(book_id):
     try:
         calibre_db.update_title_sort(config)
     except sqliteOperationalError as e:
-        log.debug_or_exception(e)
+        log.error_or_exception(e)
         calibre_db.session.rollback()
 
     # Show form
@@ -864,8 +864,13 @@ def edit_book(book_id):
         calibre_db.session.rollback()
         flash(str(e), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
+    except (OperationalError, IntegrityError) as e:
+        log.error_or_exception("Database error: {}".format(e))
+        calibre_db.session.rollback()
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
     except Exception as ex:
-        log.debug_or_exception(ex)
+        log.error_or_exception(ex)
         calibre_db.session.rollback()
         flash(_("Error editing book, please check logfile for details"), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
@@ -1103,8 +1108,8 @@ def upload():
                         return Response(json.dumps(resp), mimetype='application/json')
             except (OperationalError, IntegrityError) as e:
                 calibre_db.session.rollback()
-                log.error("Database error: %s", e)
-                flash(_(u"Database error: %(error)s.", error=e), category="error")
+                log.error_or_exception("Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
         return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
 
@@ -1234,7 +1239,7 @@ def edit_list_book(param):
             calibre_db.session.commit()
     except (OperationalError, IntegrityError) as e:
         calibre_db.session.rollback()
-        log.error("Database error: {}".format(e))
+        log.error_or_exception("Database error: {}".format(e))
         ret = Response(json.dumps({'success': False,
                                    'msg': 'Database error: {}'.format(e.orig)}),
                        mimetype='application/json')
@@ -1344,7 +1349,7 @@ def table_xchange_author_title():
                 calibre_db.session.commit()
             except (OperationalError, IntegrityError) as e:
                 calibre_db.session.rollback()
-                log.error("Database error: %s", e)
+                log.error_or_exception("Database error: %s", e)
                 return json.dumps({'success': False})
 
             if config.config_use_google_drive:
diff --git a/cps/gdrive.py b/cps/gdrive.py
index e782cb9e..60e3d47b 100644
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -152,7 +152,7 @@ try:
                     move(os.path.join(tmp_dir, "tmp_metadata.db"), dbpath)
                     calibre_db.reconnect_db(config, ub.app_DB_path)
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
         return ''
 except AttributeError:
     pass
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 57f272ff..0b704db4 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -215,7 +215,7 @@ def getDrive(drive=None, gauth=None):
             except RefreshError as e:
                 log.error("Google Drive error: %s", e)
             except Exception as ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
         else:
             # Initialize the saved creds
             gauth.Authorize()
diff --git a/cps/helper.py b/cps/helper.py
index 03a2d03b..b0b28a99 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -713,7 +713,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                     log.error('%s/cover.jpg not found on Google Drive', book.path)
                     return get_cover_on_failure(use_generic_cover_on_failure)
             except Exception as ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 return get_cover_on_failure(use_generic_cover_on_failure)
         else:
             cover_file_path = os.path.join(config.config_calibre_dir, book.path)
@@ -861,7 +861,7 @@ def check_unrar(unrarLocation):
             log.debug("unrar version %s", version)
 
     except (OSError, UnicodeDecodeError) as err:
-        log.debug_or_exception(err)
+        log.error_or_exception(err)
         return _('Error excecuting UnRar')
 
 
diff --git a/cps/logger.py b/cps/logger.py
index 053d0bd3..fcc25c27 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -42,7 +42,7 @@ logging.addLevelName(logging.CRITICAL, "CRIT")
 
 class _Logger(logging.Logger):
 
-    def debug_or_exception(self, message, stacklevel=2, *args, **kwargs):
+    def error_or_exception(self, message, stacklevel=2, *args, **kwargs):
         if sys.version_info > (3, 7):
             if is_debug_enabled():
                 self.exception(message, stacklevel=stacklevel, *args, **kwargs)
diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index acea7e07..73c7e1fc 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -105,7 +105,7 @@ class Amazon(Metadata):
                         match.cover = ""
                     return match, index
             except Exception as e:
-                log.debug_or_exception(e)
+                log.error_or_exception(e)
                 return
 
         val = list()
@@ -126,5 +126,5 @@ class Amazon(Metadata):
             result = list(filter(lambda x: x, val))
             return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
         except requests.exceptions.HTTPError as e:
-            log.debug_or_exception(e)
+            log.error_or_exception(e)
             return []
diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py
index d9efd41e..d9a60c0e 100644
--- a/cps/oauth_bb.py
+++ b/cps/oauth_bb.py
@@ -149,7 +149,7 @@ def bind_oauth_or_register(provider_id, provider_user_id, redirect_url, provider
                     log.info("Link to {} Succeeded".format(provider_name))
                     return redirect(url_for('web.profile'))
                 except Exception as ex:
-                    log.debug_or_exception(ex)
+                    log.error_or_exception(ex)
                     ub.session.rollback()
             else:
                 flash(_(u"Login failed, No User Linked With OAuth Account"), category="error")
@@ -197,7 +197,7 @@ def unlink_oauth(provider):
                 flash(_(u"Unlink to %(oauth)s Succeeded", oauth=oauth_check[provider]), category="success")
                 log.info("Unlink to {} Succeeded".format(oauth_check[provider]))
             except Exception as ex:
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 ub.session.rollback()
                 flash(_(u"Unlink to %(oauth)s Failed", oauth=oauth_check[provider]), category="error")
     except NoResultFound:
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 076c9104..aea6d640 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -178,7 +178,7 @@ class CalibreTask:
             self.run(*args)
         except Exception as ex:
             self._handleError(str(ex))
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
 
         self.end_time = datetime.now()
 
diff --git a/cps/shelf.py b/cps/shelf.py
index 27939cdc..0bf12164 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -94,10 +94,10 @@ def add_to_shelf(shelf_id, book_id):
     try:
         ub.session.merge(shelf)
         ub.session.commit()
-    except (OperationalError, InvalidRequestError):
+    except (OperationalError, InvalidRequestError) as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_(u"Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
         if "HTTP_REFERER" in request.environ:
             return redirect(request.environ["HTTP_REFERER"])
         else:
@@ -154,10 +154,10 @@ def search_to_shelf(shelf_id):
             ub.session.merge(shelf)
             ub.session.commit()
             flash(_(u"Books have been added to shelf: %(sname)s", sname=shelf.name), category="success")
-        except (OperationalError, InvalidRequestError):
+        except (OperationalError, InvalidRequestError) as e:
             ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
+            log.error_or_exception("Settings Database error: {}".format(e))
+            flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
     else:
         log.error("Could not add books to shelf: {}".format(shelf.name))
         flash(_(u"Could not add books to shelf: %(sname)s", sname=shelf.name), category="error")
@@ -197,10 +197,10 @@ def remove_from_shelf(shelf_id, book_id):
             ub.session.delete(book_shelf)
             shelf.last_modified = datetime.utcnow()
             ub.session.commit()
-        except (OperationalError, InvalidRequestError):
+        except (OperationalError, InvalidRequestError) as e:
             ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
+            log.error_or_exception("Settings Database error: {}".format(e))
+            flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
             if "HTTP_REFERER" in request.environ:
                 return redirect(request.environ["HTTP_REFERER"])
             else:
@@ -273,12 +273,12 @@ def create_edit_shelf(shelf, page_title, page, shelf_id=False):
                 return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
             except (OperationalError, InvalidRequestError) as ex:
                 ub.session.rollback()
-                log.debug_or_exception(ex)
-                log.error("Settings DB is not Writeable")
-                flash(_("Settings DB is not Writeable"), category="error")
+                log.error_or_exception(ex)
+                log.error_or_exception("Settings Database error: {}".format(ex))
+                flash(_(u"Database error: %(error)s.", error=ex.orig), category="error")
             except Exception as ex:
                 ub.session.rollback()
-                log.debug_or_exception(ex)
+                log.error_or_exception(ex)
                 flash(_(u"There was an error"), category="error")
     return render_title_template('shelf_edit.html',
                                  shelf=shelf,
@@ -337,10 +337,10 @@ def delete_shelf(shelf_id):
             flash(_("Error deleting Shelf"), category="error")
         else:
             flash(_("Shelf successfully deleted"), category="success")
-    except InvalidRequestError:
+    except InvalidRequestError as e:
         ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
     return redirect(url_for('web.index'))
 
 
@@ -374,10 +374,10 @@ def order_shelf(shelf_id):
                 # if order diffrent from before -> shelf.last_modified = datetime.utcnow()
             try:
                 ub.session.commit()
-            except (OperationalError, InvalidRequestError):
+            except (OperationalError, InvalidRequestError) as e:
                 ub.session.rollback()
-                log.error("Settings DB is not Writeable")
-                flash(_("Settings DB is not Writeable"), category="error")
+                log.error_or_exception("Settings Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
 
         result = list()
         if shelf:
@@ -450,10 +450,10 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
             try:
                 ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == entry.book_id).delete()
                 ub.session.commit()
-            except (OperationalError, InvalidRequestError):
+            except (OperationalError, InvalidRequestError) as e:
                 ub.session.rollback()
-                log.error("Settings DB is not Writeable")
-                flash(_("Settings DB is not Writeable"), category="error")
+                log.error_or_exception("Settings Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
 
         return render_title_template(page,
                                      entries=result,
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 80adbbcc..4954c2d6 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -167,10 +167,10 @@ class TaskEmail(CalibreTask):
             else:
                 self.send_gmail_email(msg)
         except MemoryError as e:
-            log.debug_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=3)
             self._handleError(u'MemoryError sending e-mail: {}'.format(str(e)))
         except (smtplib.SMTPException, smtplib.SMTPAuthenticationError) as e:
-            log.debug_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=3)
             if hasattr(e, "smtp_error"):
                 text = e.smtp_error.decode('utf-8').replace("\n", '. ')
             elif hasattr(e, "message"):
@@ -181,10 +181,10 @@ class TaskEmail(CalibreTask):
                 text = ''
             self._handleError(u'Smtplib Error sending e-mail: {}'.format(text))
         except (socket.error) as e:
-            log.debug_or_exception(e, stacklevel=3)
+            log.error_or_exception(e, stacklevel=3)
             self._handleError(u'Socket Error sending e-mail: {}'.format(e.strerror))
         except Exception as ex:
-            log.debug_or_exception(ex, stacklevel=3)
+            log.error_or_exception(ex, stacklevel=3)
             self._handleError(u'Error sending e-mail: {}'.format(ex))
 
     def send_standard_email(self, msg):
@@ -257,7 +257,7 @@ class TaskEmail(CalibreTask):
                 data = file_.read()
                 file_.close()
             except IOError as e:
-                log.debug_or_exception(e, stacklevel=3)
+                log.error_or_exception(e, stacklevel=3)
                 log.error(u'The requested file could not be read. Maybe wrong permissions?')
                 return None
         return data
diff --git a/cps/ub.py b/cps/ub.py
index 786dc909..a2be004c 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -853,5 +853,5 @@ def session_commit(success=None, _session=None):
             log.info(success)
     except (exc.OperationalError, exc.InvalidRequestError) as e:
         s.rollback()
-        log.debug_or_exception(e)
+        log.error_or_exception(e)
     return ""
diff --git a/cps/updater.py b/cps/updater.py
index 181c4374..f7341002 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -117,7 +117,7 @@ class Updater(threading.Thread):
         except (IOError, OSError) as ex:
             self.status = 12
             log.error(u'Possible Reason for error: update file could not be saved in temp dir')
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
         self.pause()
         return False
 
diff --git a/cps/web.py b/cps/web.py
index 94f511b1..e3ad4719 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1375,7 +1375,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         try:
             q = adv_search_custom_columns(cc, term, q)
         except AttributeError as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
 
     q = q.order_by(*sort_param).all()
@@ -1437,7 +1437,7 @@ def serve_book(book_id, book_format, anyname):
             df = getFileFromEbooksFolder(book.path, data.name + "." + book_format)
             return do_gdrive_download(df, headers, (book_format.upper() == 'TXT'))
         except AttributeError as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             return "File Not Found"
     else:
         if book_format.upper() == 'TXT':

From 8e2536c53b8978ec05c9cb84615a179c38aa5080 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 18:01:11 +0100
Subject: [PATCH 149/220] Improved cover extraction for epub files

---
 cps/comic.py | 78 ++++++++++++++++++----------------------------------
 cps/cover.py | 48 ++++++++++++++++++++++++++++++++
 cps/epub.py  | 35 +++++++++++++----------
 3 files changed, 95 insertions(+), 66 deletions(-)
 create mode 100644 cps/cover.py

diff --git a/cps/comic.py b/cps/comic.py
index 9e7f4f8f..2549579e 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 #   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#     Copyright (C) 2018 OzzieIsaacs
+#     Copyright (C) 2018-2022 OzzieIsaacs
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -18,19 +18,16 @@
 
 import os
 
-from . import logger, isoLanguages
+from . import logger, isoLanguages, cover
 from .constants import BookMeta
 
-
-log = logger.create()
-
-
 try:
     from wand.image import Image
     use_IM = True
 except (ImportError, RuntimeError) as e:
     use_IM = False
 
+log = logger.create()
 
 try:
     from comicapi.comicarchive import ComicArchive, MetaDataStyle
@@ -51,29 +48,8 @@ except (ImportError, LookupError) as e:
         use_rarfile = False
     use_comic_meta = False
 
-NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
-COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
 
-def _cover_processing(tmp_file_name, img, extension):
-    tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
-    if extension in NO_JPEG_EXTENSIONS:
-        if use_IM:
-            with Image(blob=img) as imgc:
-                imgc.format = 'jpeg'
-                imgc.transform_colorspace('rgb')
-                imgc.save(filename=tmp_cover_name)
-                return tmp_cover_name
-        else:
-            return None
-    if img:
-        with open(tmp_cover_name, 'wb') as f:
-            f.write(img)
-        return tmp_cover_name
-    else:
-        return None
-
-
-def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable):
+def _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_executable):
     cover_data = extension = None
     if original_file_extension.upper() == '.CBZ':
         cf = zipfile.ZipFile(tmp_file_name)
@@ -81,7 +57,7 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
-                if extension in COVER_EXTENSIONS:
+                if extension in cover.COVER_EXTENSIONS:
                     cover_data = cf.read(name)
                     break
     elif original_file_extension.upper() == '.CBT':
@@ -90,44 +66,44 @@ def _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecu
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
-                if extension in COVER_EXTENSIONS:
+                if extension in cover.COVER_EXTENSIONS:
                     cover_data = cf.extractfile(name).read()
                     break
     elif original_file_extension.upper() == '.CBR' and use_rarfile:
         try:
-            rarfile.UNRAR_TOOL = rarExecutable
+            rarfile.UNRAR_TOOL = rar_executable
             cf = rarfile.RarFile(tmp_file_name)
             for name in cf.namelist():
                 ext = os.path.splitext(name)
                 if len(ext) > 1:
                     extension = ext[1].lower()
-                    if extension in COVER_EXTENSIONS:
+                    if extension in cover.COVER_EXTENSIONS:
                         cover_data = cf.read(name)
                         break
         except Exception as ex:
-            log.debug('Rarfile failed with error: %s', ex)
+            log.debug('Rarfile failed with error: {}'.format(ex))
     return cover_data, extension
 
 
-def _extractCover(tmp_file_name, original_file_extension, rarExecutable):
+def _extract_cover(tmp_file_name, original_file_extension, rar_executable):
     cover_data = extension = None
     if use_comic_meta:
-        archive = ComicArchive(tmp_file_name, rar_exe_path=rarExecutable)
+        archive = ComicArchive(tmp_file_name, rar_exe_path=rar_executable)
         for index, name in enumerate(archive.getPageNameList()):
             ext = os.path.splitext(name)
             if len(ext) > 1:
                 extension = ext[1].lower()
-                if extension in COVER_EXTENSIONS:
+                if extension in cover.COVER_EXTENSIONS:
                     cover_data = archive.getPage(index)
                     break
     else:
-        cover_data, extension = _extract_Cover_from_archive(original_file_extension, tmp_file_name, rarExecutable)
-    return _cover_processing(tmp_file_name, cover_data, extension)
+        cover_data, extension = _extract_cover_from_archive(original_file_extension, tmp_file_name, rar_executable)
+    return cover.cover_processing(tmp_file_name, cover_data, extension)
 
 
-def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rarExecutable):
+def get_comic_info(tmp_file_path, original_file_name, original_file_extension, rar_executable):
     if use_comic_meta:
-        archive = ComicArchive(tmp_file_path, rar_exe_path=rarExecutable)
+        archive = ComicArchive(tmp_file_path, rar_exe_path=rar_executable)
         if archive.seemsToBeAComicArchive():
             if archive.hasMetadata(MetaDataStyle.CIX):
                 style = MetaDataStyle.CIX
@@ -137,23 +113,23 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
                 style = None
 
             # if style is not None:
-            loadedMetadata = archive.readMetadata(style)
+            loaded_metadata = archive.readMetadata(style)
 
-            lang = loadedMetadata.language or ""
-            loadedMetadata.language = isoLanguages.get_lang3(lang)
+            lang = loaded_metadata.language or ""
+            loaded_metadata.language = isoLanguages.get_lang3(lang)
 
             return BookMeta(
                 file_path=tmp_file_path,
                 extension=original_file_extension,
-                title=loadedMetadata.title or original_file_name,
+                title=loaded_metadata.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, rarExecutable),
-                description=loadedMetadata.comments or "",
+                                   for credit in loaded_metadata.credits if credit["role"] == "Writer"]) or 'Unknown',
+                cover=_extract_cover(tmp_file_path, original_file_extension, rar_executable),
+                description=loaded_metadata.comments or "",
                 tags="",
-                series=loadedMetadata.series or "",
-                series_id=loadedMetadata.issue or "",
-                languages=loadedMetadata.language,
+                series=loaded_metadata.series or "",
+                series_id=loaded_metadata.issue or "",
+                languages=loaded_metadata.language,
                 publisher="")
 
     return BookMeta(
@@ -161,7 +137,7 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
         extension=original_file_extension,
         title=original_file_name,
         author=u'Unknown',
-        cover=_extractCover(tmp_file_path, original_file_extension, rarExecutable),
+        cover=_extract_cover(tmp_file_path, original_file_extension, rar_executable),
         description="",
         tags="",
         series="",
diff --git a/cps/cover.py b/cps/cover.py
new file mode 100644
index 00000000..5dd29534
--- /dev/null
+++ b/cps/cover.py
@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+
+#   This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#     Copyright (C) 2022 OzzieIsaacs
+#
+#   This program is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   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 os
+
+try:
+    from wand.image import Image
+    use_IM = True
+except (ImportError, RuntimeError) as e:
+    use_IM = False
+
+
+NO_JPEG_EXTENSIONS = ['.png', '.webp', '.bmp']
+COVER_EXTENSIONS = ['.png', '.webp', '.bmp', '.jpg', '.jpeg']
+
+
+def cover_processing(tmp_file_name, img, extension):
+    tmp_cover_name = os.path.join(os.path.dirname(tmp_file_name), 'cover.jpg')
+    if extension in NO_JPEG_EXTENSIONS:
+        if use_IM:
+            with Image(blob=img) as imgc:
+                imgc.format = 'jpeg'
+                imgc.transform_colorspace('rgb')
+                imgc.save(filename=tmp_cover_name)
+                return tmp_cover_name
+        else:
+            return None
+    if img:
+        with open(tmp_cover_name, 'wb') as f:
+            f.write(img)
+        return tmp_cover_name
+    else:
+        return None
diff --git a/cps/epub.py b/cps/epub.py
index b436a755..563590e8 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -20,23 +20,26 @@ import os
 import zipfile
 from lxml import etree
 
-from . import isoLanguages
+from . import isoLanguages, cover
 from .helper import split_authors
 from .constants import BookMeta
 
 
-def extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
+def _extract_cover(zip_file, cover_file, cover_path, tmp_file_name):
     if cover_file is None:
         return None
     else:
+        cf = extension = None
         zip_cover_path = os.path.join(cover_path, cover_file).replace('\\', '/')
-        cf = zip_file.read(zip_cover_path)
+
         prefix = os.path.splitext(tmp_file_name)[0]
         tmp_cover_name = prefix + '.' + os.path.basename(zip_cover_path)
-        image = open(tmp_cover_name, 'wb')
-        image.write(cf)
-        image.close()
-        return tmp_cover_name
+        ext = os.path.splitext(tmp_cover_name)
+        if len(ext) > 1:
+            extension = ext[1].lower()
+        if extension in cover.COVER_EXTENSIONS:
+            cf = zip_file.read(zip_cover_path)
+        return cover.cover_processing(tmp_file_name, cf, extension)
 
 
 def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
@@ -70,9 +73,9 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
             else:
                 epub_metadata[s] = tmp[0]
         else:
-            epub_metadata[s] = u'Unknown'
+            epub_metadata[s] = 'Unknown'
 
-    if epub_metadata['subject'] == u'Unknown':
+    if epub_metadata['subject'] == 'Unknown':
         epub_metadata['subject'] = ''
 
     if epub_metadata['description'] == u'Unknown':
@@ -112,7 +115,7 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
     cover_section = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
     cover_file = None
     if len(cover_section) > 0:
-        cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
+        cover_file = _extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
     else:
         meta_cover = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='cover']/@content", namespaces=ns)
         if len(meta_cover) > 0:
@@ -123,10 +126,10 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
                     "/pkg:package/pkg:manifest/pkg:item[@properties='" + meta_cover[0] + "']/@href", namespaces=ns)
         else:
             cover_section = tree.xpath("/pkg:package/pkg:guide/pkg:reference/@href", namespaces=ns)
-        if len(cover_section) > 0:
-            filetype = cover_section[0].rsplit('.', 1)[-1]
+        for cs in cover_section:
+            filetype = cs.rsplit('.', 1)[-1]
             if filetype == "xhtml" or filetype == "html":  # if cover is (x)html format
-                markup = epub_zip.read(os.path.join(cover_path, cover_section[0]))
+                markup = epub_zip.read(os.path.join(cover_path, cs))
                 markup_tree = etree.fromstring(markup)
                 # no matter xhtml or html with no namespace
                 img_src = markup_tree.xpath("//*[local-name() = 'img']/@src")
@@ -137,9 +140,11 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
                     # img_src maybe start with "../"" so fullpath join then relpath to cwd
                     filename = os.path.relpath(os.path.join(os.path.dirname(os.path.join(cover_path, cover_section[0])),
                                                             img_src[0]))
-                    cover_file = extract_cover(epub_zip, filename, "", tmp_file_path)
+                    cover_file = _extract_cover(epub_zip, filename, "", tmp_file_path)
             else:
-                cover_file = extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
+                cover_file = _extract_cover(epub_zip, cs, cover_path, tmp_file_path)
+            if cover_file:
+                break
     return cover_file
 
 

From 3b5e5f9b9099ae6e07834ddc0d7539a1a1c07d77 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 12 Mar 2022 22:15:19 +0100
Subject: [PATCH 150/220] Undo check of read checkbox in case of error Display
 error message in details modal dialog Bugfix set archive bit in booktable
 Translate error message readstatus change

---
 cps/editbooks.py         |  7 +++++--
 cps/helper.py            |  2 +-
 cps/static/js/details.js | 22 ++++++++++++++++------
 cps/static/js/main.js    |  1 +
 cps/static/js/table.js   |  2 ++
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 3a08f061..30535ef3 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1212,8 +1212,11 @@ def edit_list_book(param):
                                        'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
                            mimetype='application/json')
         elif param == 'is_archived':
-            change_archived_books(book.id, vals['value'] == "True")
-            ret = ""
+            is_archived = change_archived_books(book.id, vals['value'] == "True",
+                                                message="Book {} archivebit set to: {}".format(book.id, vals['value']))
+            if is_archived:
+                kobo_sync_status.remove_synced_book(book.id)
+            return ""
         elif param == 'read_status':
             ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
             if ret:
diff --git a/cps/helper.py b/cps/helper.py
index b0b28a99..74a8dbbb 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -335,7 +335,7 @@ def edit_book_read_status(book_id, read_status=None):
         except (OperationalError, InvalidRequestError) as e:
             calibre_db.session.rollback()
             log.error(u"Read status could not set: {}".format(e))
-            return "Read status could not set: {}".format(e), 400
+            return _("Read status could not set: {}".format(e.orig))
     return ""
 
 # Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
diff --git a/cps/static/js/details.js b/cps/static/js/details.js
index 6f99595d..f0259f8c 100644
--- a/cps/static/js/details.js
+++ b/cps/static/js/details.js
@@ -28,14 +28,24 @@ $("#have_read_cb").on("change", function() {
         data: $(this).closest("form").serialize(),
         error: function(response) {
             var data = [{type:"danger", message:response.responseText}]
-            $("#flash_success").remove();
+            // $("#flash_success").parent().remove();
             $("#flash_danger").remove();
+            $(".row-fluid.text-center").remove();
             if (!jQuery.isEmptyObject(data)) {
-                data.forEach(function (item) {
-                    $(".navbar").after('<div class="row-fluid text-center" >' +
-                        '<div id="flash_' + item.type + '" class="alert alert-' + item.type + '">' + item.message + '</div>' +
-                        '</div>');
-                });
+                $("#have_read_cb").prop("checked", !$("#have_read_cb").prop("checked"));
+                if($("#bookDetailsModal").is(":visible")) {
+                    data.forEach(function (item) {
+                        $(".modal-header").after('<div id="flash_' + item.type +
+                            '" class="text-center alert alert-' + item.type + '">' + item.message + '</div>');
+                    });
+                } else
+                {
+                    data.forEach(function (item) {
+                        $(".navbar").after('<div class="row-fluid text-center" >' +
+                            '<div id="flash_' + item.type + '" class="alert alert-' + item.type + '">' + item.message + '</div>' +
+                            '</div>');
+                    });
+                }
             }
         }
     });
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 75599d9b..b18cf229 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -515,6 +515,7 @@ $(function() {
 
     $("#bookDetailsModal")
         .on("show.bs.modal", function(e) {
+            $("#flash_danger").remove();
             var $modalBody = $(this).find(".modal-body");
 
             // Prevent static assets from loading multiple times
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index ae8c591b..8af7592f 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -812,11 +812,13 @@ function checkboxChange(checkbox, userId, field, field_index) {
 
 function BookCheckboxChange(checkbox, userId, field) {
     var value = checkbox.checked ? "True" : "False";
+    var element = checkbox;
     $.ajax({
         method: "post",
         url: getPath() + "/ajax/editbooks/" + field,
         data: {"pk": userId, "value": value},
         error: function(data) {
+            element.checked = !element.checked;
             handleListServerResponse([{type:"danger", message:data.responseText}])
         },
         success: handleListServerResponse

From 296f76b5fb96c6a0747af49fba81d01514ab2092 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 13 Mar 2022 10:23:13 +0100
Subject: [PATCH 151/220] Fixes after testrun Code cosmetics

---
 cps/admin.py                            |   2 +-
 cps/templates/listenmp3.html            |   2 +-
 cps/templates/read.html                 |   2 +-
 cps/web.py                              |  17 +-
 test/Calibre-Web TestSummary_Linux.html | 503 ++++++++++++++----------
 5 files changed, 297 insertions(+), 229 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 60a674e8..3d4ca609 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -499,7 +499,7 @@ def edit_list_user(param):
                 else:
                     return _("Parameter not found"), 400
         except Exception as ex:
-            log.debug_or_exception(ex)
+            log.error_or_exception(ex)
             return str(ex), 400
     ub.session_commit()
     return ""
diff --git a/cps/templates/listenmp3.html b/cps/templates/listenmp3.html
index 7da62a20..2067bf38 100644
--- a/cps/templates/listenmp3.html
+++ b/cps/templates/listenmp3.html
@@ -134,7 +134,7 @@ window.calibre = {
         filePath: "{{ url_for('static', filename='js/libs/') }}",
         cssPath: "{{ url_for('static', filename='css/') }}",
         bookUrl: "{{ url_for('static', filename=mp3file) }}/",
-        bookmarkUrl: "{{ url_for('web.bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
+        bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=mp3file, book_format=audioformat.upper()) }}",
         bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
         useBookmarks: "{{ g.user.is_authenticated | tojson }}"
             };
diff --git a/cps/templates/read.html b/cps/templates/read.html
index 1766eb1b..f69d662f 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -86,7 +86,7 @@
           window.calibre = {
               filePath: "{{ url_for('static', filename='js/libs/') }}",
               cssPath: "{{ url_for('static', filename='css/') }}",
-              bookmarkUrl: "{{ url_for('web.bookmark', book_id=bookid, book_format='EPUB') }}",
+              bookmarkUrl: "{{ url_for('web.set_bookmark', book_id=bookid, book_format='EPUB') }}",
               bookUrl: "{{ url_for('web.serve_book', book_id=bookid, book_format='epub', anyname='file.epub') }}",
               bookmark: "{{ bookmark.bookmark_key if bookmark != None }}",
               useBookmarks: "{{ g.user.is_authenticated | tojson }}"
diff --git a/cps/web.py b/cps/web.py
index e3ad4719..8c057b9d 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -26,6 +26,7 @@ import json
 import mimetypes
 import chardet  # dependency of requests
 import copy
+from functools import wraps
 
 from babel.dates import format_date
 from babel import Locale as LC
@@ -59,6 +60,7 @@ from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
 from .kobo_sync_status import change_archived_books
 
+
 feature_support = {
     'ldap': bool(services.ldap),
     'goodreads': bool(services.goodreads_support),
@@ -72,11 +74,6 @@ except ImportError:
     feature_support['oauth'] = False
     oauth_check = {}
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
-
 try:
     from natsort import natsorted as sort
 except ImportError:
@@ -134,7 +131,7 @@ def get_email_status_json():
 
 @web.route("/ajax/bookmark/<int:book_id>/<book_format>", methods=['POST'])
 @login_required
-def bookmark(book_id, book_format):
+def set_bookmark(book_id, book_format):
     bookmark_key = request.form["bookmark"]
     ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),
                                               ub.Bookmark.book_id == book_id,
@@ -642,7 +639,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                         column=config.config_read_column),
                       category="error")
                 return redirect(url_for("web.index"))
-            # ToDo: Handle error Case for opds
+            return [] # ToDo: Handle error Case for opds
+
     if as_xml:
         return entries, pagination
     else:
@@ -809,6 +807,7 @@ def list_books():
                                     and_(ub.ReadBook.user_id == int(current_user.id),
                                          ub.ReadBook.book_id == db.Books.id)))
             else:
+                read_column = ""
                 try:
                     read_column = db.cc_classes[config.config_read_column]
                     books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
@@ -1725,12 +1724,14 @@ def profile():
 @viewer_required
 def read_book(book_id, book_format):
     book = calibre_db.get_filtered_book(book_id)
+    book.ordered_authors = calibre_db.order_authors([book], False)
+
     if not book:
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
         return redirect(url_for("web.index"))
 
-    # check if book has bookmark
+    # check if book has a bookmark
     bookmark = None
     if current_user.is_authenticated:
         bookmark = ub.session.query(ub.Bookmark).filter(and_(ub.Bookmark.user_id == int(current_user.id),
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 5daf8267..580cf3c9 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-03-02 20:56:18</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-12 22:57: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>2022-03-03 01:48:44</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-13 03:46:17</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>4h 5 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 0 min</p>
         </div>
       </div>
       </div>
@@ -725,13 +725,13 @@
 
     <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
-        <td class="text-center">19</td>
         <td class="text-center">17</td>
+        <td class="text-center">16</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 19)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
@@ -863,42 +863,7 @@
     
     
     
-        <tr id="st10.15" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.15')">SKIP</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_st10.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_st10.15').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>
-        </tr>
-    
-    
-    
-        <tr id='pt10.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='st10.17' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -907,7 +872,7 @@
     
     
     
-        <tr id='pt10.18' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -916,7 +881,7 @@
     
     
     
-        <tr id='pt10.19' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -1867,7 +1832,7 @@ AssertionError: 0.0 not greater than 0.02</pre>
                         <pre class="text-left">Traceback (most recent call last):
   File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=22ded0fa-26b4-429d-81fc-bc75707c4e4c&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4a23d5c4-e97a-42e1-bd43-351fb1de43df&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3172,11 +3137,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3213,11 +3178,35 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id="ft35.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</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_ft35.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft35.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft35.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 216, in sound_test
+    self.assertEqual(title, title_item.text)
+AssertionError: &#39;Unknown - music&#39; != &#39;- music&#39;
+- Unknown - music
++ - music</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3232,12 +3221,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestReconnect</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="errorClass">
+        <td>TestReadOnlyDatabase</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c36', 1)">Detail</a>
@@ -3246,7 +3235,65 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id="et36.1" class="none bg-info">
+            <td>
+                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_readonly_db.py&#34;, line 49, in test_readonly_path
+    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path(), &#34;config_unicode_filename&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 346, in _fill_basic_config
+    ele = cls.driver.find_element(By.ID, key)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_rarfile_location&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReconnect</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c37', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3264,13 +3311,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3279,7 +3326,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3288,7 +3335,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3297,7 +3344,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3306,7 +3353,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3315,7 +3362,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3324,7 +3371,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3333,7 +3380,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3351,13 +3398,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3366,7 +3413,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3375,7 +3422,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3393,13 +3440,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3408,7 +3455,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3417,7 +3464,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3426,7 +3473,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3435,7 +3482,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3444,7 +3491,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3453,7 +3500,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3462,7 +3509,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3471,7 +3518,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3480,7 +3527,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3489,7 +3536,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3498,7 +3545,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3507,7 +3554,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3516,19 +3563,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st39.14" class="none bg-warning">
+        <tr id="st40.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st39.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st39.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.14" 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_st39.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3542,7 +3589,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3551,7 +3598,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3569,13 +3616,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 9)">Detail</a>
+            <a onclick="showClassDetail('c41', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3584,7 +3631,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3593,7 +3640,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3602,7 +3649,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3611,7 +3658,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3620,7 +3667,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3629,19 +3676,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st40.7" class="none bg-warning">
+        <tr id="st41.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st40.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3655,7 +3702,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3664,7 +3711,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3682,13 +3729,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 2)">Detail</a>
+            <a onclick="showClassDetail('c42', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3697,7 +3744,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3707,21 +3754,21 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 18)">Detail</a>
+            <a onclick="showClassDetail('c43', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3730,7 +3777,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3739,7 +3786,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3748,7 +3795,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3757,7 +3804,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3766,7 +3813,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3775,7 +3822,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3784,7 +3831,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3793,7 +3840,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3802,7 +3849,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3811,7 +3858,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3820,7 +3867,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3829,7 +3876,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3838,7 +3885,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3847,7 +3894,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3856,16 +3903,36 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id="ft43.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</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_ft43.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 640, in test_user_list_requests
+    self.assertEqual(400, result.status_code)
+AssertionError: 400 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3874,7 +3941,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3892,13 +3959,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 1)">Detail</a>
+            <a onclick="showClassDetail('c44', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3916,13 +3983,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 21)">Detail</a>
+            <a onclick="showClassDetail('c45', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3931,7 +3998,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3940,7 +4007,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3949,7 +4016,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3958,7 +4025,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3967,7 +4034,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3976,7 +4043,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3985,7 +4052,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3994,7 +4061,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4003,7 +4070,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4012,7 +4079,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4021,7 +4088,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4030,7 +4097,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4039,7 +4106,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4048,7 +4115,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4057,7 +4124,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4066,7 +4133,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4075,7 +4142,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4084,7 +4151,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4093,7 +4160,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4102,7 +4169,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt44.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4120,13 +4187,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 34)">Detail</a>
+            <a onclick="showClassDetail('c46', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4135,7 +4202,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4144,7 +4211,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4153,7 +4220,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4162,7 +4229,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4171,7 +4238,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4180,7 +4247,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4189,7 +4256,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4198,7 +4265,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4207,7 +4274,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4216,7 +4283,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4225,7 +4292,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4234,7 +4301,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4243,7 +4310,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4252,7 +4319,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4261,7 +4328,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4270,7 +4337,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4279,7 +4346,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4288,7 +4355,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4297,7 +4364,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4306,7 +4373,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4315,7 +4382,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.22' class='hiddenRow bg-success'>
+        <tr id='pt46.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4324,7 +4391,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.23' class='hiddenRow bg-success'>
+        <tr id='pt46.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4333,7 +4400,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.24' class='hiddenRow bg-success'>
+        <tr id='pt46.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4342,7 +4409,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.25' class='hiddenRow bg-success'>
+        <tr id='pt46.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4351,7 +4418,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.26' class='hiddenRow bg-success'>
+        <tr id='pt46.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4360,7 +4427,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.27' class='hiddenRow bg-success'>
+        <tr id='pt46.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4369,7 +4436,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.28' class='hiddenRow bg-success'>
+        <tr id='pt46.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4378,7 +4445,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.29' class='hiddenRow bg-success'>
+        <tr id='pt46.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4387,7 +4454,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.30' class='hiddenRow bg-success'>
+        <tr id='pt46.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4396,7 +4463,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.31' class='hiddenRow bg-success'>
+        <tr id='pt46.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4405,7 +4472,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.32' class='hiddenRow bg-success'>
+        <tr id='pt46.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4414,7 +4481,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.33' class='hiddenRow bg-success'>
+        <tr id='pt46.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4423,7 +4490,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt45.34' class='hiddenRow bg-success'>
+        <tr id='pt46.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4441,13 +4508,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 16)">Detail</a>
+            <a onclick="showClassDetail('c47', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4456,7 +4523,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4465,7 +4532,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4474,7 +4541,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4483,7 +4550,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4492,7 +4559,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4501,7 +4568,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4510,7 +4577,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4519,7 +4586,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4528,7 +4595,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4537,7 +4604,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4546,7 +4613,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4555,7 +4622,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4564,7 +4631,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4573,7 +4640,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4582,7 +4649,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4593,11 +4660,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>404</td>
-        <td>394</td>
-        <td>3</td>
-        <td>0</td>
-        <td>7</td>
+        <td>403</td>
+        <td>391</td>
+        <td>5</td>
+        <td>1</td>
+        <td>6</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -4625,7 +4692,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-30-generic #33~20.04.1-Ubuntu SMP Mon Feb 7 14:25:10 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-35-generic #40~20.04.1-Ubuntu SMP Mon Mar 7 09:18:32 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4727,7 +4794,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.31</td>
+              <td>1.4.32</td>
               <td>Basic</td>
             </tr>
           
@@ -4739,7 +4806,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>Unidecode</th>
-              <td>1.3.3</td>
+              <td>1.3.4</td>
               <td>Basic</td>
             </tr>
           
@@ -4757,7 +4824,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4787,7 +4854,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4817,7 +4884,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4859,7 +4926,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4895,7 +4962,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4931,13 +4998,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>scholarly</th>
-              <td>1.5.1</td>
+              <td>1.6.0</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.39.0</td>
+              <td>2.40.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5027,7 +5094,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 </div>
 
 <script>
-    drawCircle(394, 3, 0, 7);
+    drawCircle(391, 5, 1, 6);
     showCase(5);
 </script>
 

From 4545f4a20d9ff90b99bbd4e3e34b6de4441d6367 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 13 Mar 2022 12:34:21 +0100
Subject: [PATCH 152/220] Better epub cover parsing with multiple cover-image
 items Code cosmetics renamed variables refactored xml page generation
 refactored prepare author

---
 cps.py                        |   4 +-
 cps/__init__.py               |   2 +-
 cps/admin.py                  |  57 +++---
 cps/db.py                     |  66 +++----
 cps/editbooks.py              | 309 +++++++++++++++++---------------
 cps/epub.py                   |  20 ++-
 cps/helper.py                 | 177 ++++++++++---------
 cps/opds.py                   | 241 ++++++++++---------------
 cps/pagination.py             |   8 +-
 cps/remotelogin.py            |   5 +-
 cps/templates/book_edit.html  |   4 +-
 cps/templates/book_table.html |  16 +-
 cps/templates/detail.html     |   4 +-
 cps/templates/layout.html     |   2 +-
 cps/usermanagement.py         |   5 +-
 cps/web.py                    | 322 ++++++++++++++++++----------------
 optional-requirements.txt     |   8 +-
 requirements.txt              |   3 +-
 18 files changed, 609 insertions(+), 644 deletions(-)

diff --git a/cps.py b/cps.py
index 277da288..8959679a 100755
--- a/cps.py
+++ b/cps.py
@@ -40,7 +40,7 @@ from cps.about import about
 from cps.shelf import shelf
 from cps.admin import admi
 from cps.gdrive import gdrive
-from cps.editbooks import editbook
+from cps.editbooks import EditBook
 from cps.remotelogin import remotelogin
 from cps.search_metadata import meta
 from cps.error_handler import init_errorhandler
@@ -73,7 +73,7 @@ def main():
     app.register_blueprint(remotelogin)
     app.register_blueprint(meta)
     app.register_blueprint(gdrive)
-    app.register_blueprint(editbook)
+    app.register_blueprint(EditBook)
     if kobo_available:
         app.register_blueprint(kobo)
         app.register_blueprint(kobo_auth)
diff --git a/cps/__init__.py b/cps/__init__.py
index 2dfad699..0b912d23 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -156,7 +156,7 @@ def create_app():
         services.goodreads_support.connect(config.config_goodreads_api_key,
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
-    config.store_calibre_uuid(calibre_db, db.Library_Id)
+    config.store_calibre_uuid(calibre_db, db.LibraryId)
     return app
 
 @babel.localeselector
diff --git a/cps/admin.py b/cps/admin.py
index 3d4ca609..5d8ed9c1 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -27,8 +27,9 @@ import json
 import time
 import operator
 from datetime import datetime, timedelta
+from functools import wraps
 
-from babel import Locale as LC
+from babel import Locale
 from babel.dates import format_datetime
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
@@ -47,7 +48,6 @@ from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from . import debug_info, _BABEL_TRANSLATIONS
 
-from functools import wraps
 
 log = logger.create()
 
@@ -189,10 +189,10 @@ def admin():
         else:
             commit = version['version']
 
-    allUser = ub.session.query(ub.User).all()
+    all_user = ub.session.query(ub.User).all()
     email_settings = config.get_mail_settings()
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    return render_title_template("admin.html", allUser=allUser, email=email_settings, config=config, commit=commit,
+    return render_title_template("admin.html", allUser=all_user, email=email_settings, config=config, commit=commit,
                                  feature_support=feature_support, kobo_support=kobo_support,
                                  title=_(u"Admin page"), page="admin")
 
@@ -242,12 +242,12 @@ def calibreweb_alive():
 @login_required
 @admin_required
 def view_configuration():
-    read_column = calibre_db.session.query(db.Custom_Columns)\
-        .filter(and_(db.Custom_Columns.datatype == 'bool', db.Custom_Columns.mark_for_delete == 0)).all()
-    restrict_columns = calibre_db.session.query(db.Custom_Columns)\
-        .filter(and_(db.Custom_Columns.datatype == 'text', db.Custom_Columns.mark_for_delete == 0)).all()
+    read_column = calibre_db.session.query(db.CustomColumns)\
+        .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all()
+    restrict_columns = calibre_db.session.query(db.CustomColumns)\
+        .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all()
     languages = calibre_db.speaking_language()
-    translations = [LC('en')] + babel.list_translations()
+    translations = [Locale('en')] + babel.list_translations()
     return render_title_template("config_view_edit.html", conf=config, readColumns=read_column,
                                  restrictColumns=restrict_columns,
                                  languages=languages,
@@ -261,8 +261,8 @@ def view_configuration():
 def edit_user_table():
     visibility = current_user.view_settings.get('useredit', {})
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [LC('en')]
-    allUser = ub.session.query(ub.User)
+    translations = babel.list_translations() + [Locale('en')]
+    all_user = ub.session.query(ub.User)
     tags = calibre_db.session.query(db.Tags)\
         .join(db.books_tags_link)\
         .join(db.Books)\
@@ -274,10 +274,10 @@ def edit_user_table():
     else:
         custom_values = []
     if not config.config_anonbrowse:
-        allUser = allUser.filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS)
+        all_user = all_user.filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS)
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     return render_title_template("user_table.html",
-                                 users=allUser.all(),
+                                 users=all_user.all(),
                                  tags=tags,
                                  custom_values=custom_values,
                                  translations=translations,
@@ -332,7 +332,7 @@ def list_users():
         if user.default_language == "all":
             user.default = _("All")
         else:
-            user.default = LC.parse(user.default_language).get_language_name(get_locale())
+            user.default = Locale.parse(user.default_language).get_language_name(get_locale())
 
     table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": users}
     js_list = json.dumps(table_entries, cls=db.AlchemyEncoder)
@@ -380,7 +380,7 @@ def delete_user():
 @login_required
 @admin_required
 def table_get_locale():
-    locale = babel.list_translations() + [LC('en')]
+    locale = babel.list_translations() + [Locale('en')]
     ret = list()
     current_locale = get_locale()
     for loc in locale:
@@ -444,7 +444,7 @@ def edit_list_user(param):
                 elif param.endswith('role'):
                     value = int(vals['field_index'])
                     if user.name == "Guest" and value in \
-                                 [constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
+                            [constants.ROLE_ADMIN, constants.ROLE_PASSWD, constants.ROLE_EDIT_SHELFS]:
                         raise Exception(_("Guest can't have this role"))
                     # check for valid value, last on checks for power of 2 value
                     if value > 0 and value <= constants.ROLE_VIEWER and (value & value-1 == 0 or value == 1):
@@ -524,16 +524,16 @@ def update_table_settings():
 
 def check_valid_read_column(column):
     if column != "0":
-        if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
-              .filter(and_(db.Custom_Columns.datatype == 'bool', db.Custom_Columns.mark_for_delete == 0)).all():
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
             return False
     return True
 
 
 def check_valid_restricted_column(column):
     if column != "0":
-        if not calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.id == column) \
-              .filter(and_(db.Custom_Columns.datatype == 'text', db.Custom_Columns.mark_for_delete == 0)).all():
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
             return False
     return True
 
@@ -1078,12 +1078,12 @@ def _configuration_oauth_helper(to_save):
     reboot_required = False
     for element in oauthblueprints:
         if to_save["config_" + str(element['id']) + "_oauth_client_id"] != element['oauth_client_id'] \
-            or to_save["config_" + str(element['id']) + "_oauth_client_secret"] != element['oauth_client_secret']:
+                or to_save["config_" + str(element['id']) + "_oauth_client_secret"] != element['oauth_client_secret']:
             reboot_required = True
             element['oauth_client_id'] = to_save["config_" + str(element['id']) + "_oauth_client_id"]
             element['oauth_client_secret'] = to_save["config_" + str(element['id']) + "_oauth_client_secret"]
         if to_save["config_" + str(element['id']) + "_oauth_client_id"] \
-            and to_save["config_" + str(element['id']) + "_oauth_client_secret"]:
+                and to_save["config_" + str(element['id']) + "_oauth_client_secret"]:
             active_oauths += 1
             element["active"] = 1
         else:
@@ -1136,7 +1136,7 @@ def _configuration_ldap_helper(to_save):
     if not config.config_ldap_provider_url \
         or not config.config_ldap_port \
         or not config.config_ldap_dn \
-        or not config.config_ldap_user_object:
+            or not config.config_ldap_user_object:
         return reboot_required, _configuration_result(_('Please Enter a LDAP Provider, '
                                                         'Port, DN and User Object Identifier'))
 
@@ -1211,6 +1211,7 @@ def _db_configuration_update_helper():
                                            '',
                                            to_save['config_calibre_dir'],
                                            flags=re.IGNORECASE)
+    db_valid = False
     try:
         db_change, db_valid = _db_simulate_change()
 
@@ -1229,11 +1230,11 @@ def _db_configuration_update_helper():
         return _db_configuration_result('{}'.format(ex), gdrive_error)
 
     if db_change or not db_valid or not config.db_configured \
-          or config.config_calibre_dir != to_save["config_calibre_dir"]:
+            or config.config_calibre_dir != to_save["config_calibre_dir"]:
         if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
-        config.store_calibre_uuid(calibre_db, db.Library_Id)
+        config.store_calibre_uuid(calibre_db, db.LibraryId)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
             log.info("Calibre Database changed, delete all Calibre-Web info related to old Database")
@@ -1272,7 +1273,7 @@ def _configuration_update_helper():
         _config_checkbox_int(to_save, "config_unicode_filename")
         # Reboot on config_anonbrowse with enabled ldap, as decoraters are changed in this case
         reboot_required |= (_config_checkbox_int(to_save, "config_anonbrowse")
-                             and config.config_login_type == constants.LOGIN_LDAP)
+                            and config.config_login_type == constants.LOGIN_LDAP)
         _config_checkbox_int(to_save, "config_public_reg")
         _config_checkbox_int(to_save, "config_register_email")
         reboot_required |= _config_checkbox_int(to_save, "config_kobo_sync")
@@ -1560,7 +1561,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
 def new_user():
     content = ub.User()
     languages = calibre_db.speaking_language()
-    translations = [LC('en')] + babel.list_translations()
+    translations = [Locale('en')] + babel.list_translations()
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if request.method == "POST":
         to_save = request.form.to_dict()
@@ -1647,7 +1648,7 @@ def edit_user(user_id):
         flash(_(u"User not found"), category="error")
         return redirect(url_for('admin.admin'))
     languages = calibre_db.speaking_language(return_all_languages=True)
-    translations = babel.list_translations() + [LC('en')]
+    translations = babel.list_translations() + [Locale('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if request.method == "POST":
         to_save = request.form.to_dict()
diff --git a/cps/db.py b/cps/db.py
index 2292614c..b910363b 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -17,13 +17,13 @@
 #  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 copy
 import os
 import re
 import ast
 import json
 from datetime import datetime
 from urllib.parse import quote
+import unidecode
 
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey, CheckConstraint
@@ -49,11 +49,6 @@ from .pagination import Pagination
 
 from weakref import WeakSet
 
-try:
-    import unidecode
-    use_unidecode = True
-except ImportError:
-    use_unidecode = False
 
 log = logger.create()
 
@@ -93,7 +88,7 @@ books_publishers_link = Table('books_publishers_link', Base.metadata,
                               )
 
 
-class Library_Id(Base):
+class LibraryId(Base):
     __tablename__ = 'library_id'
     id = Column(Integer, primary_key=True)
     uuid = Column(String, nullable=False)
@@ -112,7 +107,7 @@ class Identifiers(Base):
         self.type = id_type
         self.book = book
 
-    def formatType(self):
+    def format_type(self):
         format_type = self.type.lower()
         if format_type == 'amazon':
             return u"Amazon"
@@ -184,8 +179,8 @@ class Comments(Base):
     book = Column(Integer, ForeignKey('books.id'), nullable=False, unique=True)
     text = Column(String(collation='NOCASE'), nullable=False)
 
-    def __init__(self, text, book):
-        self.text = text
+    def __init__(self, comment, book):
+        self.text = comment
         self.book = book
 
     def get(self):
@@ -367,7 +362,6 @@ class Books(Base):
         self.path = path
         self.has_cover = (has_cover != None)
 
-
     def __repr__(self):
         return u"<Books('{0},{1}{2}{3}{4}{5}{6}{7}{8}')>".format(self.title, self.sort, self.author_sort,
                                                                  self.timestamp, self.pubdate, self.series_index,
@@ -375,10 +369,10 @@ class Books(Base):
 
     @property
     def atom_timestamp(self):
-        return (self.timestamp.strftime('%Y-%m-%dT%H:%M:%S+00:00') or '')
+        return self.timestamp.strftime('%Y-%m-%dT%H:%M:%S+00:00') or ''
 
 
-class Custom_Columns(Base):
+class CustomColumns(Base):
     __tablename__ = 'custom_columns'
 
     id = Column(Integer, primary_key=True)
@@ -436,7 +430,7 @@ class AlchemyEncoder(json.JSONEncoder):
         return json.JSONEncoder.default(self, o)
 
 
-class CalibreDB():
+class CalibreDB:
     _init = False
     engine = None
     config = None
@@ -450,17 +444,17 @@ class CalibreDB():
         """
         self.session = None
         if self._init:
-            self.initSession(expire_on_commit)
+            self.init_session(expire_on_commit)
 
         self.instances.add(self)
 
-    def initSession(self, expire_on_commit=True):
+    def init_session(self, expire_on_commit=True):
         self.session = self.session_factory()
         self.session.expire_on_commit = expire_on_commit
         self.update_title_sort(self.config)
 
     @classmethod
-    def setup_db_cc_classes(self, cc):
+    def setup_db_cc_classes(cls, cc):
         cc_ids = []
         books_custom_column_links = {}
         for row in cc:
@@ -539,16 +533,16 @@ class CalibreDB():
             return False, False
         try:
             check_engine = create_engine('sqlite://',
-                          echo=False,
-                          isolation_level="SERIALIZABLE",
-                          connect_args={'check_same_thread': False},
-                          poolclass=StaticPool)
+                                         echo=False,
+                                         isolation_level="SERIALIZABLE",
+                                         connect_args={'check_same_thread': False},
+                                         poolclass=StaticPool)
             with check_engine.begin() as connection:
                 connection.execute(text("attach database '{}' as calibre;".format(dbpath)))
                 connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
                 local_session = scoped_session(sessionmaker())
                 local_session.configure(bind=connection)
-                database_uuid = local_session().query(Library_Id).one_or_none()
+                database_uuid = local_session().query(LibraryId).one_or_none()
                 # local_session.dispose()
 
             check_engine.connect()
@@ -603,7 +597,7 @@ class CalibreDB():
                                                           autoflush=True,
                                                           bind=cls.engine))
         for inst in cls.instances:
-            inst.initSession()
+            inst.init_session()
 
         cls._init = True
         return True
@@ -644,12 +638,10 @@ class CalibreDB():
     # Language and content filters for displaying in the UI
     def common_filters(self, allow_show_archived=False, return_all_languages=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_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 = Books.id.notin_(archived_book_ids)
         else:
@@ -668,11 +660,11 @@ class CalibreDB():
                 pos_cc_list = current_user.allowed_column_value.split(',')
                 pos_content_cc_filter = true() if pos_cc_list == [''] else \
                     getattr(Books, 'custom_column_' + str(self.config.config_restricted_column)). \
-                        any(cc_classes[self.config.config_restricted_column].value.in_(pos_cc_list))
+                    any(cc_classes[self.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(Books, 'custom_column_' + str(self.config.config_restricted_column)). \
-                        any(cc_classes[self.config.config_restricted_column].value.in_(neg_cc_list))
+                    any(cc_classes[self.config.config_restricted_column].value.in_(neg_cc_list))
             except (KeyError, AttributeError):
                 pos_content_cc_filter = false()
                 neg_content_cc_filter = true()
@@ -728,7 +720,7 @@ class CalibreDB():
                 query = (self.session.query(database, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
                          .select_from(Books)
                          .outerjoin(ub.ReadBook,
-                               and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
+                                    and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
             else:
                 try:
                     read_column = cc_classes[config_read_column]
@@ -738,7 +730,7 @@ class CalibreDB():
                 except (KeyError, AttributeError):
                     log.error("Custom Column No.%d is not existing in calibre database", read_column)
                     # Skip linking read column and return None instead of read status
-                    query =self.session.query(database, None, ub.ArchivedBook.is_archived)
+                    query = self.session.query(database, None, ub.ArchivedBook.is_archived)
             query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
                                                           int(current_user.id) == ub.ArchivedBook.user_id))
         else:
@@ -812,7 +804,6 @@ class CalibreDB():
                 return authors_ordered
         return entries
 
-
     def get_typeahead(self, database, query, replace=('', ''), tag_filter=true()):
         query = query or ''
         self.session.connection().connection.connection.create_function("lower", 1, lcase)
@@ -872,7 +863,7 @@ class CalibreDB():
                 ))
 
     # read search results from calibre-database and return it (function is used for feed and simple search
-    def get_search_results(self, term, offset=None, order=None, limit=None, allow_show_archived=False,
+    def get_search_results(self, term, offset=None, order=None, limit=None,
                            config_read_column=False, *join):
         order = order[0] if order else [Books.sort]
         pagination = None
@@ -915,7 +906,6 @@ class CalibreDB():
                 lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
             return sorted(languages, key=lambda x: x.name, reverse=reverse_order)
 
-
     def update_title_sort(self, config, conn=None):
         # user defined sort function for calibre databases (Series, etc.)
         def _title_sort(title):
@@ -973,6 +963,6 @@ def lcase(s):
     try:
         return unidecode.unidecode(s.lower())
     except Exception as ex:
-        log = logger.create()
-        log.error_or_exception(ex)
+        _log = logger.create()
+        _log.error_or_exception(ex)
         return s.lower()
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 30535ef3..728164f9 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -31,7 +31,7 @@ from functools import wraps
 try:
     from lxml.html.clean import clean_html
 except ImportError:
-    pass
+    clean_html = None
 
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
@@ -48,7 +48,7 @@ from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import change_archived_books
 
 
-editbook = Blueprint('editbook', __name__)
+EditBook = Blueprint('edit-book', __name__)
 log = logger.create()
 
 
@@ -61,6 +61,7 @@ def upload_required(f):
 
     return inner
 
+
 def edit_required(f):
     @wraps(f)
     def inner(*args, **kwargs):
@@ -70,6 +71,7 @@ def edit_required(f):
 
     return inner
 
+
 def search_objects_remove(db_book_object, db_type, input_elements):
     del_elements = []
     for c_elements in db_book_object:
@@ -119,6 +121,7 @@ def remove_objects(db_book_object, db_session, del_elements):
                 db_session.delete(del_element)
     return changed
 
+
 def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
     changed = False
     if db_type == 'languages':
@@ -128,7 +131,7 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
     else:
         db_filter = db_object.name
     for add_element in add_elements:
-        # check if a element with that name exists
+        # check if an element with that name exists
         db_element = db_session.query(db_object).filter(db_filter == add_element).first()
         # if no element is found add it
         if db_type == 'author':
@@ -147,7 +150,6 @@ def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
             db_book_object.append(new_element)
         else:
             db_element = create_objects_for_addition(db_element, add_element, db_type)
-            changed = True
             # add element to book
             changed = True
             db_book_object.append(db_element)
@@ -178,7 +180,7 @@ def create_objects_for_addition(db_element, add_element, db_type):
     return db_element
 
 
-# Modifies different Database objects, first check if elements if elements have to be deleted,
+# Modifies different Database objects, first check if elements have to be deleted,
 # because they are no longer used, than check if elements have to be added to database
 def modify_database_object(input_elements, db_book_object, db_object, db_session, db_type):
     # passing input_elements not as a list may lead to undesired results
@@ -207,7 +209,7 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
     input_dict = dict([(identifier.type.lower(), identifier) for identifier in input_identifiers])
     if len(input_identifiers) != len(input_dict):
         error = True
-    db_dict = dict([(identifier.type.lower(), identifier) for identifier in db_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():
@@ -224,14 +226,15 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
             changed = True
     return changed, error
 
-@editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
+
+@EditBook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
     return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
 
 
-@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
-@editbook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
+@EditBook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
+@EditBook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
 @login_required
 def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
@@ -252,8 +255,8 @@ def delete_whole_book(book_id, book):
     modify_database_object([u''], book.languages, db.Languages, calibre_db.session, 'languages')
     modify_database_object([u''], book.publishers, db.Publishers, calibre_db.session, 'publishers')
 
-    cc = calibre_db.session.query(db.Custom_Columns). \
-        filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    cc = calibre_db.session.query(db.CustomColumns). \
+        filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     for c in cc:
         cc_string = "custom_column_" + str(c.id)
         if not c.is_multiple:
@@ -283,18 +286,18 @@ def delete_whole_book(book_id, book):
     calibre_db.session.query(db.Books).filter(db.Books.id == book_id).delete()
 
 
-def render_delete_book_result(book_format, jsonResponse, warning, book_id):
+def render_delete_book_result(book_format, json_response, warning, book_id):
     if book_format:
-        if jsonResponse:
-            return json.dumps([warning, {"location": url_for("editbook.edit_book", book_id=book_id),
+        if json_response:
+            return json.dumps([warning, {"location": url_for("edit-book.edit_book", book_id=book_id),
                                          "type": "success",
                                          "format": book_format,
                                          "message": _('Book Format Successfully Deleted')}])
         else:
             flash(_('Book Format Successfully Deleted'), category="success")
-            return redirect(url_for('editbook.edit_book', book_id=book_id))
+            return redirect(url_for('edit-book.edit_book', book_id=book_id))
     else:
-        if jsonResponse:
+        if json_response:
             return json.dumps([warning, {"location": url_for('web.index'),
                                          "type": "success",
                                          "format": book_format,
@@ -304,7 +307,7 @@ def render_delete_book_result(book_format, jsonResponse, warning, book_id):
             return redirect(url_for('web.index'))
 
 
-def delete_book_from_table(book_id, book_format, jsonResponse):
+def delete_book_from_table(book_id, book_format, json_response):
     warning = {}
     if current_user.role_delete_books():
         book = calibre_db.get_book(book_id)
@@ -312,20 +315,20 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
             try:
                 result, error = helper.delete_book(book, config.config_calibre_dir, book_format=book_format.upper())
                 if not result:
-                    if jsonResponse:
-                        return json.dumps([{"location": url_for("editbook.edit_book", book_id=book_id),
-                                           "type": "danger",
-                                           "format": "",
-                                           "message": error}])
+                    if json_response:
+                        return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
+                                            "type": "danger",
+                                            "format": "",
+                                            "message": error}])
                     else:
                         flash(error, category="error")
-                        return redirect(url_for('editbook.edit_book', book_id=book_id))
+                        return redirect(url_for('edit-book.edit_book', book_id=book_id))
                 if error:
-                    if jsonResponse:
-                        warning = {"location": url_for("editbook.edit_book", book_id=book_id),
-                                                "type": "warning",
-                                                "format": "",
-                                                "message": error}
+                    if json_response:
+                        warning = {"location": url_for("edit-book.edit_book", book_id=book_id),
+                                   "type": "warning",
+                                   "format": "",
+                                   "message": error}
                     else:
                         flash(error, category="warning")
                 if not book_format:
@@ -339,35 +342,36 @@ def delete_book_from_table(book_id, book_format, jsonResponse):
             except Exception as ex:
                 log.error_or_exception(ex)
                 calibre_db.session.rollback()
-                if jsonResponse:
-                    return json.dumps([{"location": url_for("editbook.edit_book", book_id=book_id),
+                if json_response:
+                    return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
                                         "type": "danger",
                                         "format": "",
                                         "message": ex}])
                 else:
                     flash(str(ex), category="error")
-                    return redirect(url_for('editbook.edit_book', book_id=book_id))
+                    return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
         else:
             # book not found
             log.error('Book with id "%s" could not be deleted: not found', book_id)
-        return render_delete_book_result(book_format, jsonResponse, warning, book_id)
+        return render_delete_book_result(book_format, json_response, warning, book_id)
     message = _("You are missing permissions to delete books")
-    if jsonResponse:
-        return json.dumps({"location": url_for("editbook.edit_book", book_id=book_id),
+    if json_response:
+        return json.dumps({"location": url_for("edit-book.edit_book", book_id=book_id),
                            "type": "danger",
                            "format": "",
                            "message": message})
     else:
         flash(message, category="error")
-        return redirect(url_for('editbook.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
 
 def render_edit_book(book_id):
-    cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    cc = calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
     if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         return redirect(url_for("web.index"))
 
     for lang in book.languages:
@@ -380,9 +384,9 @@ def render_edit_book(book_id):
         author_names.append(authr.name.replace('|', ','))
 
     # Option for showing convertbook button
-    valid_source_formats=list()
+    valid_source_formats = list()
     allowed_conversion_formats = list()
-    kepub_possible=None
+    kepub_possible = None
     if config.config_converterpath:
         for file in book.data:
             if file.format.lower() in constants.EXTENSIONS_CONVERT_FROM:
@@ -430,6 +434,7 @@ def edit_book_ratings(to_save, book):
             changed = True
     return changed
 
+
 def edit_book_tags(tags, book):
     input_tags = tags.split(',')
     input_tags = list(map(lambda it: it.strip(), input_tags))
@@ -446,48 +451,48 @@ def edit_book_series(series, book):
 
 def edit_book_series_index(series_index, book):
     # Add default series_index to book
-    modif_date = False
+    modify_date = False
     series_index = series_index or '1'
     if not series_index.replace('.', '', 1).isdigit():
         flash(_("%(seriesindex)s is not a valid number, skipping", seriesindex=series_index), category="warning")
         return False
     if str(book.series_index) != series_index:
         book.series_index = series_index
-        modif_date = True
-    return modif_date
+        modify_date = True
+    return modify_date
 
 
 # Handle book comments/description
 def edit_book_comments(comments, book):
-    modif_date = False
+    modify_date = False
     if comments:
         comments = clean_html(comments)
     if len(book.comments):
         if book.comments[0].text != comments:
             book.comments[0].text = comments
-            modif_date = True
+            modify_date = True
     else:
         if comments:
-            book.comments.append(db.Comments(text=comments, book=book.id))
-            modif_date = True
-    return modif_date
+            book.comments.append(db.Comments(comment=comments, book=book.id))
+            modify_date = True
+    return modify_date
 
 
-def edit_book_languages(languages, book, upload=False, invalid=None):
+def edit_book_languages(languages, book, upload_mode=False, invalid=None):
     input_languages = languages.split(',')
     unknown_languages = []
-    if not upload:
+    if not upload_mode:
         input_l = isoLanguages.get_language_codes(get_locale(), input_languages, unknown_languages)
     else:
         input_l = isoLanguages.get_valid_language_codes(get_locale(), input_languages, unknown_languages)
-    for l in unknown_languages:
-        log.error("'%s' is not a valid language", l)
+    for lang in unknown_languages:
+        log.error("'%s' is not a valid language", lang)
         if isinstance(invalid, list):
-            invalid.append(l)
+            invalid.append(lang)
         else:
-            raise ValueError(_(u"'%(langname)s' is not a valid language", langname=l))
+            raise ValueError(_(u"'%(langname)s' is not a valid language", langname=lang))
     # ToDo: Not working correct
-    if upload and len(input_l) == 1:
+    if upload_mode and len(input_l) == 1:
         # If the language of the file is excluded from the users view, it's not imported, to allow the user to view
         # the book it's language is set to the filter language
         if input_l[0] != current_user.filter_language() and current_user.filter_language() != "all":
@@ -571,17 +576,20 @@ def edit_cc_data_string(book, c, to_save, cc_db_value, cc_string):
         getattr(book, cc_string).append(new_cc)
     return changed, to_save
 
+
 def edit_single_cc_data(book_id, book, column_id, to_save):
-    cc = (calibre_db.session.query(db.Custom_Columns)
-          .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions))
-          .filter(db.Custom_Columns.id == column_id)
+    cc = (calibre_db.session.query(db.CustomColumns)
+          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions))
+          .filter(db.CustomColumns.id == column_id)
           .all())
     return edit_cc_data(book_id, book, to_save, cc)
 
+
 def edit_all_cc_data(book_id, book, to_save):
-    cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    cc = calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     return edit_cc_data(book_id, book, to_save, cc)
 
+
 def edit_cc_data(book_id, book, to_save, cc):
     changed = False
     for c in cc:
@@ -614,10 +622,11 @@ def edit_cc_data(book_id, book, to_save, cc):
                                               'custom')
     return changed
 
-def upload_single_file(request, book, book_id):
+
+def upload_single_file(file_request, book, book_id):
     # Check and handle Uploaded file
-    if 'btn-upload-format' in request.files:
-        requested_file = request.files['btn-upload-format']
+    if 'btn-upload-format' in file_request.files:
+        requested_file = file_request.files['btn-upload-format']
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
@@ -669,17 +678,17 @@ def upload_single_file(request, book, book_id):
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
-            uploadText=_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
-            WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(book.title)))
+            upload_text = _(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
+            WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(book.title)))
 
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
                 rarExecutable=config.config_rarfile_location)
 
 
-def upload_cover(request, book):
-    if 'btn-upload-cover' in request.files:
-        requested_file = request.files['btn-upload-cover']
+def upload_cover(cover_request, book):
+    if 'btn-upload-cover' in cover_request.files:
+        requested_file = cover_request.files['btn-upload-cover']
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
@@ -706,8 +715,8 @@ def handle_title_on_edit(book, book_title):
 
 def handle_author_on_edit(book, author_name, update_stored=True):
     # handle author(s)
-    # renamed = False
-    input_authors = author_name.split('&')
+    input_authors, renamed = prepare_authors(author_name)
+    '''input_authors = author_name.split('&')
     input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
     # Remove duplicates in authors list
     input_authors = helper.uniq(input_authors)
@@ -725,7 +734,7 @@ def handle_author_on_edit(book, author_name, update_stored=True):
             sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
             sorted_old_author = helper.get_sorted_author(in_aut)
             for one_book in all_books:
-                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)'''
 
     change = modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
 
@@ -746,11 +755,11 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     return input_authors, change, renamed
 
 
-@editbook.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
+@EditBook.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
-    modif_date = False
+    modify_date = False
 
     # create the function for sorting...
     try:
@@ -767,13 +776,14 @@ def edit_book(book_id):
 
     # Book not found
     if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         return redirect(url_for("web.index"))
 
     meta = upload_single_file(request, book, book_id)
     if upload_cover(request, book) is True:
         book.has_cover = 1
-        modif_date = True
+        modify_date = True
     try:
         to_save = request.form.to_dict()
         merge_metadata(to_save, meta)
@@ -786,15 +796,15 @@ def edit_book(book_id):
         input_authors, authorchange, renamed = handle_author_on_edit(book, to_save["author_name"])
         if authorchange or title_change:
             edited_books_id = book.id
-            modif_date = True
+            modify_date = True
 
         if config.config_use_google_drive:
             gdriveutils.updateGdriveCalibreFromLocal()
 
-        error = False
+        error = ""
         if edited_books_id:
             error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                               renamed_author=renamed)
+                                                renamed_author=renamed)
 
         if not error:
             if "cover_url" in to_save:
@@ -808,32 +818,32 @@ def edit_book(book_id):
                         result, error = helper.save_cover_from_url(to_save["cover_url"], book.path)
                         if result is True:
                             book.has_cover = 1
-                            modif_date = True
+                            modify_date = True
                         else:
                             flash(error, category="error")
 
             # Add default series_index to book
-            modif_date |= edit_book_series_index(to_save["series_index"], book)
+            modify_date |= edit_book_series_index(to_save["series_index"], book)
             # Handle book comments/description
-            modif_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
+            modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
             # Handle identifiers
             input_identifiers = identifier_list(to_save, book)
             modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
             if warning:
                 flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-            modif_date |= modification
+            modify_date |= modification
             # Handle book tags
-            modif_date |= edit_book_tags(to_save['tags'], book)
+            modify_date |= edit_book_tags(to_save['tags'], book)
             # Handle book series
-            modif_date |= edit_book_series(to_save["series"], book)
+            modify_date |= edit_book_series(to_save["series"], book)
             # handle book publisher
-            modif_date |= edit_book_publisher(to_save['publisher'], book)
+            modify_date |= edit_book_publisher(to_save['publisher'], book)
             # handle book languages
-            modif_date |= edit_book_languages(to_save['languages'], book)
+            modify_date |= edit_book_languages(to_save['languages'], book)
             # handle book ratings
-            modif_date |= edit_book_ratings(to_save, book)
+            modify_date |= edit_book_ratings(to_save, book)
             # handle cc data
-            modif_date |= edit_all_cc_data(book_id, book, to_save)
+            modify_date |= edit_all_cc_data(book_id, book, to_save)
 
             if to_save["pubdate"]:
                 try:
@@ -843,7 +853,7 @@ def edit_book(book_id):
             else:
                 book.pubdate = db.Books.DEFAULT_PUBDATE
 
-            if modif_date:
+            if modify_date:
                 book.last_modified = datetime.utcnow()
                 kobo_sync_status.remove_synced_book(edited_books_id, all=True)
 
@@ -905,14 +915,7 @@ def identifier_list(to_save, book):
     return result
 
 
-def prepare_authors_on_upload(title, authr):
-    if title != _(u'Unknown') and authr != _(u'Unknown'):
-        entry = calibre_db.check_exists_book(authr, title)
-        if entry:
-            log.info("Uploaded book probably exists in library")
-            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
-                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
-
+def prepare_authors(authr):
     # handle authors
     input_authors = authr.split('&')
     # handle_authors(input_authors)
@@ -935,6 +938,18 @@ def prepare_authors_on_upload(title, authr):
             sorted_old_author = helper.get_sorted_author(in_aut)
             for one_book in all_books:
                 one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+    return input_authors, renamed
+
+
+def prepare_authors_on_upload(title, authr):
+    if title != _(u'Unknown') and authr != _(u'Unknown'):
+        entry = calibre_db.check_exists_book(authr, title)
+        if entry:
+            log.info("Uploaded book probably exists in library")
+            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
+                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
+
+    input_authors, renamed = prepare_authors(authr)
 
     sort_authors_list = list()
     db_author = None
@@ -955,7 +970,7 @@ def prepare_authors_on_upload(title, authr):
     return sort_authors, input_authors, db_author, renamed
 
 
-def create_book_on_upload(modif_date, meta):
+def create_book_on_upload(modify_date, meta):
     title = meta.title
     authr = meta.author
     sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
@@ -963,34 +978,34 @@ def create_book_on_upload(modif_date, meta):
     title_dir = helper.get_valid_filename(title, chars=96)
     author_dir = helper.get_valid_filename(db_author.name, chars=96)
 
-    # combine path and normalize path from windows systems
+    # combine path and normalize path from Windows systems
     path = os.path.join(author_dir, title_dir).replace('\\', '/')
 
     # Calibre adds books with utc as timezone
     db_book = db.Books(title, "", sort_authors, datetime.utcnow(), datetime(101, 1, 1),
                        '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
 
-    modif_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
-                                         'author')
+    modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
+                                          'author')
 
     # Add series_index to book
-    modif_date |= edit_book_series_index(meta.series_id, db_book)
+    modify_date |= edit_book_series_index(meta.series_id, db_book)
 
     # add languages
-    invalid=[]
-    modif_date |= edit_book_languages(meta.languages, db_book, upload=True, invalid=invalid)
+    invalid = []
+    modify_date |= edit_book_languages(meta.languages, db_book, upload_mode=True, invalid=invalid)
     if invalid:
-        for l in invalid:
-            flash(_(u"'%(langname)s' is not a valid language", langname=l), category="warning")
+        for lang in invalid:
+            flash(_(u"'%(langname)s' is not a valid language", langname=lang), category="warning")
 
     # handle tags
-    modif_date |= edit_book_tags(meta.tags, db_book)
+    modify_date |= edit_book_tags(meta.tags, db_book)
 
     # handle publisher
-    modif_date |= edit_book_publisher(meta.publisher, db_book)
+    modify_date |= edit_book_publisher(meta.publisher, db_book)
 
     # handle series
-    modif_date |= edit_book_series(meta.series, db_book)
+    modify_date |= edit_book_series(meta.series, db_book)
 
     # Add file to book
     file_size = os.path.getsize(meta.file_path)
@@ -1002,6 +1017,7 @@ def create_book_on_upload(modif_date, meta):
     calibre_db.session.flush()
     return db_book, input_authors, title_dir, renamed_authors
 
+
 def file_handling_on_upload(requested_file):
     # check if file extension is correct
     if '.' in requested_file.filename:
@@ -1045,7 +1061,7 @@ def move_coverfile(meta, db_book):
               category="error")
 
 
-@editbook.route("/upload", methods=["POST"])
+@EditBook.route("/upload", methods=["POST"])
 @login_required_if_no_ano
 @upload_required
 def upload():
@@ -1054,7 +1070,7 @@ def upload():
     if request.method == 'POST' and 'btn-upload' in request.files:
         for requested_file in request.files.getlist("btn-upload"):
             try:
-                modif_date = False
+                modify_date = False
                 # create the function for sorting...
                 calibre_db.update_title_sort(config)
                 calibre_db.session.connection().connection.connection.create_function('uuid4', 0, lambda: str(uuid4()))
@@ -1063,10 +1079,10 @@ def upload():
                 if error:
                     return error
 
-                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modif_date, meta)
+                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modify_date, meta)
 
-                # Comments needs book id therefore only possible after flush
-                modif_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
+                # Comments need book id therefore only possible after flush
+                modify_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
 
                 book_id = db_book.id
                 title = db_book.title
@@ -1096,12 +1112,12 @@ def upload():
                 if error:
                     flash(error, category="error")
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
-                uploadText = _(u"File %(file)s uploaded", file=link)
-                WorkerThread.add(current_user.name, TaskUpload(uploadText, escape(title)))
+                upload_text = _(u"File %(file)s uploaded", file=link)
+                WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
-                        resp = {"location": url_for('editbook.edit_book', book_id=book_id)}
+                        resp = {"location": url_for('edit-book.edit_book', book_id=book_id)}
                         return Response(json.dumps(resp), mimetype='application/json')
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
@@ -1113,7 +1129,7 @@ def upload():
         return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
 
-@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
+@EditBook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def convert_bookformat(book_id):
@@ -1123,7 +1139,7 @@ def convert_bookformat(book_id):
 
     if (book_format_from is None) or (book_format_to is None):
         flash(_(u"Source or destination format for conversion missing"), category="error")
-        return redirect(url_for('editbook.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
     log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
     rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
@@ -1131,31 +1147,33 @@ def convert_bookformat(book_id):
 
     if rtn is None:
         flash(_(u"Book successfully queued for converting to %(book_format)s",
-                    book_format=book_format_to),
-                    category="success")
+                book_format=book_format_to),
+              category="success")
     else:
         flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
-    return redirect(url_for('editbook.edit_book', book_id=book_id))
+    return redirect(url_for('edit-book.edit_book', book_id=book_id))
 
-@editbook.route("/ajax/getcustomenum/<int:c_id>")
+
+@EditBook.route("/ajax/getcustomenum/<int:c_id>")
 @login_required
 def table_get_custom_enum(c_id):
     ret = list()
-    cc = (calibre_db.session.query(db.Custom_Columns)
-              .filter(db.Custom_Columns.id == c_id)
-              .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).one_or_none())
+    cc = (calibre_db.session.query(db.CustomColumns)
+          .filter(db.CustomColumns.id == c_id)
+          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).one_or_none())
     ret.append({'value': "", 'text': ""})
     for idx, en in enumerate(cc.get_display_dict()['enum_values']):
         ret.append({'value': en, 'text': en})
     return json.dumps(ret)
 
 
-@editbook.route("/ajax/editbooks/<param>", methods=['POST'])
+@EditBook.route("/ajax/editbooks/<param>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
+    sort_param = ""
     # ret = ""
     try:
         if param == 'series_index':
@@ -1172,7 +1190,7 @@ def edit_list_book(param):
         elif param == 'publishers':
             edit_book_publisher(vals['value'], book)
             ret = Response(json.dumps({'success': True,
-                                        'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
                            mimetype='application/json')
         elif param == 'languages':
             invalid = list()
@@ -1186,13 +1204,13 @@ def edit_list_book(param):
                 for lang in book.languages:
                     lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
                 ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
-                                mimetype='application/json')
+                               mimetype='application/json')
         elif param == 'author_sort':
             book.author_sort = vals['value']
             ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
                            mimetype='application/json')
         elif param == 'title':
-            sort = book.sort
+            sort_param = book.sort
             handle_title_on_edit(book, vals.get('value', ""))
             helper.update_dir_structure(book.id, config.config_calibre_dir)
             ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
@@ -1208,12 +1226,13 @@ def edit_list_book(param):
         elif param == 'authors':
             input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
             helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
-            ret = Response(json.dumps({'success': True,
-                                       'newValue':  ' & '.join([author.replace('|',',') for author in input_authors])}),
-                           mimetype='application/json')
+            ret = Response(json.dumps({
+                'success': True,
+                'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+                mimetype='application/json')
         elif param == 'is_archived':
             is_archived = change_archived_books(book.id, vals['value'] == "True",
-                                                message="Book {} archivebit set to: {}".format(book.id, vals['value']))
+                                                message="Book {} archive bit set to: {}".format(book.id, vals['value']))
             if is_archived:
                 kobo_sync_status.remove_synced_book(book.id)
             return ""
@@ -1238,7 +1257,7 @@ def edit_list_book(param):
         calibre_db.session.commit()
         # revert change for sort if automatic fields link is deactivated
         if param == 'title' and vals.get('checkT') == "false":
-            book.sort = sort
+            book.sort = sort_param
             calibre_db.session.commit()
     except (OperationalError, IntegrityError) as e:
         calibre_db.session.rollback()
@@ -1249,7 +1268,7 @@ def edit_list_book(param):
     return ret
 
 
-@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
+@EditBook.route("/ajax/sort_value/<field>/<int:bookid>")
 @login_required
 def get_sorted_entry(field, bookid):
     if field in ['title', 'authors', 'sort', 'author_sort']:
@@ -1266,7 +1285,7 @@ def get_sorted_entry(field, bookid):
     return ""
 
 
-@editbook.route("/ajax/simulatemerge", methods=['POST'])
+@EditBook.route("/ajax/simulatemerge", methods=['POST'])
 @login_required
 @edit_required
 def simulate_merge_list_book():
@@ -1282,7 +1301,7 @@ def simulate_merge_list_book():
     return ""
 
 
-@editbook.route("/ajax/mergebooks", methods=['POST'])
+@EditBook.route("/ajax/mergebooks", methods=['POST'])
 @login_required
 @edit_required
 def merge_list_book():
@@ -1295,8 +1314,9 @@ def merge_list_book():
         if to_book:
             for file in to_book.data:
                 to_file.append(file.format)
-            to_name = helper.get_valid_filename(to_book.title, chars=96) + ' - ' + \
-                      helper.get_valid_filename(to_book.authors[0].name, chars=96)
+            to_name = helper.get_valid_filename(to_book.title,
+                                                chars=96) + ' - ' + helper.get_valid_filename(to_book.authors[0].name,
+                                                                                              chars=96)
             for book_id in vals:
                 from_book = calibre_db.get_book(book_id)
                 if from_book:
@@ -1314,19 +1334,20 @@ def merge_list_book():
                                                         element.format,
                                                         element.uncompressed_size,
                                                         to_name))
-                    delete_book_from_table(from_book.id,"", True)
+                    delete_book_from_table(from_book.id, "", True)
                     return json.dumps({'success': True})
     return ""
 
 
-@editbook.route("/ajax/xchange", methods=['POST'])
+@EditBook.route("/ajax/xchange", methods=['POST'])
 @login_required
 @edit_required
 def table_xchange_author_title():
     vals = request.get_json().get('xchange')
+    edited_books_id = False
     if vals:
         for val in vals:
-            modif_date = False
+            modify_date = False
             book = calibre_db.get_book(val)
             authors = book.title
             book.authors = calibre_db.order_authors([book])
@@ -1338,15 +1359,15 @@ def table_xchange_author_title():
             input_authors, authorchange, renamed = handle_author_on_edit(book, authors)
             if authorchange or title_change:
                 edited_books_id = book.id
-                modif_date = True
+                modify_date = True
 
             if config.config_use_google_drive:
                 gdriveutils.updateGdriveCalibreFromLocal()
 
             if edited_books_id:
                 helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                           renamed_author=renamed)
-            if modif_date:
+                                            renamed_author=renamed)
+            if modify_date:
                 book.last_modified = datetime.utcnow()
             try:
                 calibre_db.session.commit()
diff --git a/cps/epub.py b/cps/epub.py
index 563590e8..80c12c35 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -53,11 +53,11 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     txt = epub_zip.read('META-INF/container.xml')
     tree = etree.fromstring(txt)
-    cfname = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
-    cf = epub_zip.read(cfname)
+    cf_name = tree.xpath('n:rootfiles/n:rootfile/@full-path', namespaces=ns)[0]
+    cf = epub_zip.read(cf_name)
     tree = etree.fromstring(cf)
 
-    coverpath = os.path.dirname(cfname)
+    cover_path = os.path.dirname(cf_name)
 
     p = tree.xpath('/pkg:package/pkg:metadata', namespaces=ns)[0]
 
@@ -90,7 +90,7 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     epub_metadata = parse_epub_series(ns, tree, epub_metadata)
 
-    cover_file = parse_epub_cover(ns, tree, epub_zip, coverpath, tmp_file_path)
+    cover_file = parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path)
 
     if not epub_metadata['title']:
         title = original_file_name
@@ -114,9 +114,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
     cover_section = tree.xpath("/pkg:package/pkg:manifest/pkg:item[@id='cover-image']/@href", namespaces=ns)
     cover_file = None
-    if len(cover_section) > 0:
-        cover_file = _extract_cover(epub_zip, cover_section[0], cover_path, tmp_file_path)
-    else:
+    # if len(cover_section) > 0:
+    for cs in cover_section:
+        cover_file = _extract_cover(epub_zip, cs, cover_path, tmp_file_path)
+        if cover_file:
+            break
+    if not cover_file:
         meta_cover = tree.xpath("/pkg:package/pkg:metadata/pkg:meta[@name='cover']/@content", namespaces=ns)
         if len(meta_cover) > 0:
             cover_section = tree.xpath(
@@ -143,8 +146,7 @@ def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
                     cover_file = _extract_cover(epub_zip, filename, "", tmp_file_path)
             else:
                 cover_file = _extract_cover(epub_zip, cs, cover_path, tmp_file_path)
-            if cover_file:
-                break
+            if cover_file: break
     return cover_file
 
 
diff --git a/cps/helper.py b/cps/helper.py
index 74a8dbbb..3b0c2a04 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -23,11 +23,10 @@ import mimetypes
 import re
 import shutil
 import socket
-import unicodedata
 from datetime import datetime, timedelta
 from tempfile import gettempdir
-from urllib.parse import urlparse
 import requests
+import unidecode
 
 from babel.dates import format_datetime
 from babel.units import format_unit
@@ -41,15 +40,19 @@ from werkzeug.security import generate_password_hash
 from markupsafe import escape
 from urllib.parse import quote
 
+
 try:
-    import unidecode
-    use_unidecode = True
+    import advocate
+    from advocate.exceptions import UnacceptableAddressException
+    use_advocate = True
 except ImportError:
-    use_unidecode = False
+    use_advocate = False
+    advocate = requests
+    UnacceptableAddressException = MissingSchema = BaseException
 
 from . import calibre_db, cli
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub, kobo_sync_status
+from . import logger, config, get_locale, db, ub
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR
 from .subproc_wrapper import process_wait
@@ -143,7 +146,7 @@ def check_send_to_kindle_with_converter(formats):
                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
                                       orig='Epub',
                                       format='Mobi')})
-    if 'AZW3' in formats and not 'MOBI' in formats:
+    if 'AZW3' in formats and 'MOBI' not in formats:
         bookformats.append({'format': 'Mobi',
                             'convert': 2,
                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
@@ -185,11 +188,11 @@ def check_send_to_kindle(entry):
 # Check if a reader is existing for any of the book formats, if not, return empty list, otherwise return
 # list with supported formats
 def check_read_formats(entry):
-    EXTENSIONS_READER = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
+    extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
     bookformats = list()
     if len(entry.data):
         for ele in iter(entry.data):
-            if ele.format.upper() in EXTENSIONS_READER:
+            if ele.format.upper() in extensions_reader:
                 bookformats.append(ele.format.lower())
     return bookformats
 
@@ -213,10 +216,10 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title))
-            EmailText = _(u"%(book)s send to Kindle", book=link)
+            email_text = _(u"%(book)s send to Kindle", book=link)
             WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
                              config.get_mail_settings(), kindle_mail,
-                             EmailText, _(u'This e-mail has been sent via Calibre-Web.')))
+                             email_text, _(u'This e-mail has been sent via Calibre-Web.')))
             return
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
@@ -229,15 +232,8 @@ def get_valid_filename(value, replace_whitespace=True, chars=128):
     if value[-1:] == u'.':
         value = value[:-1]+u'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
-    if use_unidecode:
-        if config.config_unicode_filename:
-            value = (unidecode.unidecode(value))
-    else:
-        value = value.replace(u'§', u'SS')
-        value = value.replace(u'ß', u'ss')
-        value = unicodedata.normalize('NFKD', value)
-        re_slugify = re.compile(r'[\W\s-]', re.UNICODE)
-        value = re_slugify.sub('', value)
+    if config.config_unicode_filename:
+        value = (unidecode.unidecode(value))
     if replace_whitespace:
         #  *+:\"/<>? are replaced by _
         value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U)
@@ -266,6 +262,7 @@ def split_authors(values):
 
 
 def get_sorted_author(value):
+    value2 = None
     try:
         if ',' not in value:
             regexes = [r"^(JR|SR)\.?$", r"^I{1,3}\.?$", r"^IV\.?$"]
@@ -290,6 +287,7 @@ def get_sorted_author(value):
             value2 = value
     return value2
 
+
 def edit_book_read_status(book_id, read_status=None):
     if not config.config_read_column:
         book = ub.session.query(ub.ReadBook).filter(and_(ub.ReadBook.user_id == int(current_user.id),
@@ -303,9 +301,9 @@ def edit_book_read_status(book_id, read_status=None):
             else:
                 book.read_status = ub.ReadBook.STATUS_FINISHED if read_status else ub.ReadBook.STATUS_UNREAD
         else:
-            readBook = ub.ReadBook(user_id=current_user.id, book_id = book_id)
-            readBook.read_status = ub.ReadBook.STATUS_FINISHED
-            book = readBook
+            read_book = ub.ReadBook(user_id=current_user.id, book_id=book_id)
+            read_book.read_status = ub.ReadBook.STATUS_FINISHED
+            book = read_book
         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()
@@ -332,12 +330,13 @@ def edit_book_read_status(book_id, read_status=None):
         except (KeyError, AttributeError):
             log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
             return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)
-        except (OperationalError, InvalidRequestError) as e:
+        except (OperationalError, InvalidRequestError) as ex:
             calibre_db.session.rollback()
-            log.error(u"Read status could not set: {}".format(e))
-            return _("Read status could not set: {}".format(e.orig))
+            log.error(u"Read status could not set: {}".format(ex))
+            return _("Read status could not set: {}".format(ex.orig))
     return ""
 
+
 # Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
 def delete_book_file(book, calibrepath, book_format=None):
     # check that path is 2 elements deep, check that target path has no subfolders
@@ -361,15 +360,15 @@ def delete_book_file(book, calibrepath, book_format=None):
                                            id=book.id,
                                            path=book.path)
                     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)
+                except (IOError, OSError) as ex:
+                    log.error("Deleting book %s failed: %s", book.id, ex)
+                    return False, _("Deleting book %(id)s failed: %(message)s", id=book.id, message=ex)
                 authorpath = os.path.join(calibrepath, os.path.split(book.path)[0])
                 if not os.listdir(authorpath):
                     try:
                         shutil.rmtree(authorpath)
-                    except (IOError, OSError) as e:
-                        log.error("Deleting authorpath for book %s failed: %s", book.id, e)
+                    except (IOError, OSError) as ex:
+                        log.error("Deleting authorpath for book %s failed: %s", book.id, ex)
                 return True, None
 
     log.error("Deleting book %s from database only, book path in database not valid: %s",
@@ -395,21 +394,21 @@ def clean_author_database(renamed_author, calibre_path="", local_book=None, gdri
                 all_titledir = book.path.split('/')[1]
                 all_new_path = os.path.join(calibre_path, all_new_authordir, all_titledir)
                 all_new_name = get_valid_filename(book.title, chars=42) + ' - ' \
-                               + get_valid_filename(new_author.name, chars=42)
+                    + get_valid_filename(new_author.name, chars=42)
                 # change location in database to new author/title path
                 book.path = os.path.join(all_new_authordir, all_titledir).replace('\\', '/')
                 for file_format in book.data:
                     if not gdrive:
                         shutil.move(os.path.normcase(os.path.join(all_new_path,
                                                                   file_format.name + '.' + file_format.format.lower())),
-                            os.path.normcase(os.path.join(all_new_path,
-                                                          all_new_name + '.' + file_format.format.lower())))
+                                    os.path.normcase(os.path.join(all_new_path,
+                                                                  all_new_name + '.' + file_format.format.lower())))
                     else:
-                        gFile = gd.getFileFromEbooksFolder(all_new_path,
-                                                           file_format.name + '.' + file_format.format.lower())
-                        if gFile:
-                            gd.moveGdriveFileRemote(gFile, all_new_name + u'.' + file_format.format.lower())
-                            gd.updateDatabaseOnEdit(gFile['id'], all_new_name + u'.' + file_format.format.lower())
+                        g_file = gd.getFileFromEbooksFolder(all_new_path,
+                                                            file_format.name + '.' + file_format.format.lower())
+                        if g_file:
+                            gd.moveGdriveFileRemote(g_file, all_new_name + u'.' + file_format.format.lower())
+                            gd.updateDatabaseOnEdit(g_file['id'], all_new_name + u'.' + file_format.format.lower())
                         else:
                             log.error("File {} not found on gdrive"
                                       .format(all_new_path, file_format.name + '.' + file_format.format.lower()))
@@ -426,16 +425,16 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
             old_author_dir = get_valid_filename(r, chars=96)
             new_author_rename_dir = get_valid_filename(new_author.name, chars=96)
             if gdrive:
-                gFile = gd.getFileFromEbooksFolder(None, old_author_dir)
-                if gFile:
-                    gd.moveGdriveFolderRemote(gFile, new_author_rename_dir)
+                g_file = gd.getFileFromEbooksFolder(None, old_author_dir)
+                if g_file:
+                    gd.moveGdriveFolderRemote(g_file, new_author_rename_dir)
             else:
                 if os.path.isdir(os.path.join(calibre_path, old_author_dir)):
                     try:
                         old_author_path = os.path.join(calibre_path, old_author_dir)
                         new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                         shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
-                    except (OSError) as ex:
+                    except OSError as ex:
                         log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
                         log.debug(ex, exc_info=True)
                         return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
@@ -444,6 +443,7 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
         new_authordir = get_valid_filename(localbook.authors[0].name, chars=96)
     return new_authordir
 
+
 # Moves files in file storage during author/title rename, or from temp dir to file storage
 def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
@@ -483,11 +483,9 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
 
 
 def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_dir, original_filepath, filename_ext):
-    error = False
     book = calibre_db.get_book(book_id)
     file_name = get_valid_filename(title, chars=42) + ' - ' + \
-                get_valid_filename(first_author, chars=42) + \
-                filename_ext
+        get_valid_filename(first_author, chars=42) + filename_ext
     rename_all_authors(first_author, renamed_author, gdrive=True)
     gdrive_path = os.path.join(get_valid_filename(first_author, chars=96),
                                title_dir + " (" + str(book_id) + ")")
@@ -505,20 +503,20 @@ def update_dir_structure_gdrive(book_id, first_author, renamed_author):
     new_titledir = get_valid_filename(book.title, chars=96) + u" (" + str(book_id) + u")"
 
     if titledir != new_titledir:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
-        if gFile:
-            gd.moveGdriveFileRemote(gFile, new_titledir)
+        g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), titledir)
+        if g_file:
+            gd.moveGdriveFileRemote(g_file, new_titledir)
             book.path = book.path.split('/')[0] + u'/' + new_titledir
-            gd.updateDatabaseOnEdit(gFile['id'], book.path)     # only child folder affected
+            gd.updateDatabaseOnEdit(g_file['id'], book.path)     # only child folder affected
         else:
             return _(u'File %(file)s not found on Google Drive', file=book.path)  # file not found
 
     if authordir != new_authordir and authordir not in renamed_author:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
-        if gFile:
-            gd.moveGdriveFolderRemote(gFile, new_authordir)
+        g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), new_titledir)
+        if g_file:
+            gd.moveGdriveFolderRemote(g_file, new_authordir)
             book.path = new_authordir + u'/' + book.path.split('/')[1]
-            gd.updateDatabaseOnEdit(gFile['id'], book.path)
+            gd.updateDatabaseOnEdit(g_file['id'], book.path)
         else:
             return _(u'File %(file)s not found on Google Drive', file=authordir)  # file not found
 
@@ -542,15 +540,15 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
                 # move original path to new path
                 log.debug("Moving title: %s to %s", path, new_path)
                 shutil.move(os.path.normcase(path), os.path.normcase(new_path))
-            else: # path is valid copy only files to new location (merge)
+            else:  # path is valid copy only files to new location (merge)
                 log.info("Moving title: %s into existing: %s", path, new_path)
                 # Take all files and subfolder from old path (strange command)
                 for dir_name, __, file_list in os.walk(path):
                     for file in file_list:
                         shutil.move(os.path.normcase(os.path.join(dir_name, file)),
-                                        os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
+                                    os.path.normcase(os.path.join(new_path + dir_name[len(path):], file)))
         # change location in database to new author/title path
-        localbook.path = os.path.join(new_authordir, new_titledir).replace('\\','/')
+        localbook.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
     except OSError as ex:
         log.error("Rename title from: %s to %s: %s", path, new_path, ex)
         log.debug(ex, exc_info=True)
@@ -587,12 +585,12 @@ def delete_book_gdrive(book, book_format):
         for entry in book.data:
             if entry.format.upper() == book_format:
                 name = entry.name + '.' + book_format
-        gFile = gd.getFileFromEbooksFolder(book.path, name)
+        g_file = gd.getFileFromEbooksFolder(book.path, name)
     else:
-        gFile = gd.getFileFromEbooksFolder(os.path.dirname(book.path), book.path.split('/')[1])
-    if gFile:
-        gd.deleteDatabaseEntry(gFile['id'])
-        gFile.Trash()
+        g_file = gd.getFileFromEbooksFolder(os.path.dirname(book.path), book.path.split('/')[1])
+    if g_file:
+        gd.deleteDatabaseEntry(g_file['id'])
+        g_file.Trash()
     else:
         error = _(u'Book path %(path)s not found on Google Drive', path=book.path)  # file not found
 
@@ -624,12 +622,13 @@ def generate_random_password():
 
 def uniq(inpt):
     output = []
-    inpt = [ " ".join(inp.split()) for inp in inpt]
+    inpt = [" ".join(inp.split()) for inp in inpt]
     for x in inpt:
         if x not in output:
             output.append(x)
     return output
 
+
 def check_email(email):
     email = valid_email(email)
     if ub.session.query(ub.User).filter(func.lower(ub.User.email) == email.lower()).first():
@@ -642,7 +641,7 @@ def check_username(username):
     username = username.strip()
     if ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).scalar():
         log.error(u"This username is already taken")
-        raise Exception (_(u"This username is already taken"))
+        raise Exception(_(u"This username is already taken"))
     return username
 
 
@@ -728,13 +727,13 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        if not cli.allow_localhost:
-            # 127.0.x.x, localhost, [::1], [::ffff:7f00:1]
-            ip = socket.getaddrinfo(urlparse(url).hostname, 0)[0][4][0]
-            if ip.startswith("127.") or ip.startswith('::ffff:7f') or ip == "::1" or ip == "0.0.0.0" or ip == "::":
-                log.error("Localhost was accessed for cover upload")
-                return False, _("You are not allowed to access localhost for cover uploads")
-        img = requests.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
+        if cli.allow_localhost:
+            img = requests.get(url, timeout=(10, 200), allow_redirects=False)  # ToDo: Error Handling
+        elif use_advocate:
+            img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
+        else:
+            log.error("python modul advocate is not installed but is needed")
+            return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
         return save_cover(img, book_path)
     except (socket.gaierror,
@@ -746,6 +745,9 @@ def save_cover_from_url(url, book_path):
     except MissingDelegateError as ex:
         log.info(u'File Format Error %s', ex)
         return False, _("Cover Format Error")
+    except UnacceptableAddressException:
+        log.error("Localhost was accessed for cover upload")
+        return False, _("You are not allowed to access localhost for cover uploads")
 
 
 def save_cover_from_filestorage(filepath, saved_filename, img):
@@ -808,7 +810,7 @@ def save_cover(img, book_path):
             os.mkdir(tmp_dir)
         ret, message = save_cover_from_filestorage(tmp_dir, "uploaded_cover.jpg", img)
         if ret is True:
-            gd.uploadFileToEbooksFolder(os.path.join(book_path, 'cover.jpg').replace("\\","/"),
+            gd.uploadFileToEbooksFolder(os.path.join(book_path, 'cover.jpg').replace("\\", "/"),
                                         os.path.join(tmp_dir, "uploaded_cover.jpg"))
             log.info("Cover is saved on Google Drive")
             return True, None
@@ -820,9 +822,9 @@ def save_cover(img, book_path):
 
 def do_download_file(book, book_format, client, data, headers):
     if config.config_use_google_drive:
-        #startTime = time.time()
+        # startTime = time.time()
         df = gd.getFileFromEbooksFolder(book.path, data.name + "." + book_format)
-        #log.debug('%s', time.time() - startTime)
+        # log.debug('%s', time.time() - startTime)
         if df:
             return gd.do_gdrive_download(df, headers)
         else:
@@ -846,16 +848,16 @@ def do_download_file(book, book_format, client, data, headers):
 ##################################
 
 
-def check_unrar(unrarLocation):
-    if not unrarLocation:
+def check_unrar(unrar_location):
+    if not unrar_location:
         return
 
-    if not os.path.exists(unrarLocation):
+    if not os.path.exists(unrar_location):
         return _('Unrar binary file not found')
 
     try:
-        unrarLocation = [unrarLocation]
-        value = process_wait(unrarLocation, pattern='UNRAR (.*) freeware')
+        unrar_location = [unrar_location]
+        value = process_wait(unrar_location, pattern='UNRAR (.*) freeware')
         if value:
             version = value.group(1)
             log.debug("unrar version %s", version)
@@ -882,19 +884,19 @@ def json_serial(obj):
 
 # helper function for displaying the runtime of tasks
 def format_runtime(runtime):
-    retVal = ""
+    ret_val = ""
     if runtime.days:
-        retVal = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
+        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
     mins, seconds = divmod(runtime.seconds, 60)
     hours, minutes = divmod(mins, 60)
     # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
     if hours:
-        retVal += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
+        ret_val += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
     elif minutes:
-        retVal += '{:2d}:{:02d}s'.format(minutes, seconds)
+        ret_val += '{:2d}:{:02d}s'.format(minutes, seconds)
     else:
-        retVal += '{:2d}s'.format(seconds)
-    return retVal
+        ret_val += '{:2d}s'.format(seconds)
+    return ret_val
 
 
 # helper function to apply localize status information in tasklist entries
@@ -951,8 +953,8 @@ def check_valid_domain(domain_text):
 
 
 def get_cc_columns(filter_config_custom_read=False):
-    tmpcc = calibre_db.session.query(db.Custom_Columns)\
-        .filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
+    tmpcc = calibre_db.session.query(db.CustomColumns)\
+        .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
     cc = []
     r = None
     if config.config_columns_to_ignore:
@@ -971,6 +973,7 @@ def get_cc_columns(filter_config_custom_read=False):
 def get_download_link(book_id, book_format, client):
     book_format = book_format.split(".")[0]
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
+    data1= ""
     if book:
         data1 = calibre_db.get_book_format(book.id, book_format.upper())
     else:
diff --git a/cps/opds.py b/cps/opds.py
index 1f9b9db4..c0637c6b 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -28,7 +28,6 @@ from flask import Blueprint, request, render_template, Response, g, make_respons
 from flask_login import current_user
 from sqlalchemy.sql.expression import func, text, or_, and_, true
 from werkzeug.security import check_password_hash
-from tornado.httputil import HTTPServerRequest
 from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages
 from .helper import get_download_link, get_book_cover
 from .pagination import Pagination
@@ -99,26 +98,7 @@ def feed_normal_search():
 @opds.route("/opds/books")
 @requires_basic_auth_if_no_ano
 def feed_booksindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Books.sort, 1, 1)).label('id'))\
-        .filter(calibre_db.common_filters()).group_by(func.upper(func.substr(db.Books.sort, 1, 1))).all()
-
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
-
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_books',
-                               pagination=pagination)
+    return render_element_index(db.Books.sort, None, 'opds.feed_letter_books')
 
 
 @opds.route("/opds/books/letter/<book_id>")
@@ -171,43 +151,23 @@ def feed_hot():
     hot_books = all_books.offset(off).limit(config.config_books_per_page)
     entries = list()
     for book in hot_books:
-        downloadBook = calibre_db.get_book(book.Downloads.book_id)
-        if downloadBook:
+        download_book = calibre_db.get_book(book.Downloads.book_id)
+        if download_book:
             entries.append(
                 calibre_db.get_filtered_book(book.Downloads.book_id)
             )
         else:
             ub.delete_download(book.Downloads.book_id)
-    numBooks = entries.__len__()
+    num_books = entries.__len__()
     pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1),
-                            config.config_books_per_page, numBooks)
+                            config.config_books_per_page, num_books)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
 @opds.route("/opds/author")
 @requires_basic_auth_if_no_ano
 def feed_authorindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Authors.sort, 1, 1)).label('id'))\
-        .join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters())\
-        .group_by(func.upper(func.substr(db.Authors.sort, 1, 1))).all()
-
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
-
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_author',
-                               pagination=pagination)
+    return render_element_index(db.Authors.sort, db.books_authors_link, 'opds.feed_letter_author')
 
 
 @opds.route("/opds/author/letter/<book_id>")
@@ -228,12 +188,7 @@ def feed_letter_author(book_id):
 @opds.route("/opds/author/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_author(book_id):
-    off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
-                                                        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)
+    return render_xml_dataset(db.Authors, book_id)
 
 
 @opds.route("/opds/publisher")
@@ -254,37 +209,14 @@ def feed_publisherindex():
 @opds.route("/opds/publisher/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_publisher(book_id):
-    off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
-                                                        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)
+    return render_xml_dataset(db.Publishers, book_id)
 
 
 @opds.route("/opds/category")
 @requires_basic_auth_if_no_ano
 def feed_categoryindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Tags.name, 1, 1)).label('id'))\
-        .join(db.books_tags_link).join(db.Books).filter(calibre_db.common_filters())\
-        .group_by(func.upper(func.substr(db.Tags.name, 1, 1))).all()
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
+    return render_element_index(db.Tags.name, db.books_tags_link, 'opds.feed_letter_category')
 
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_category',
-                               pagination=pagination)
 
 @opds.route("/opds/category/letter/<book_id>")
 @requires_basic_auth_if_no_ano
@@ -306,36 +238,14 @@ def feed_letter_category(book_id):
 @opds.route("/opds/category/<int:book_id>")
 @requires_basic_auth_if_no_ano
 def feed_category(book_id):
-    off = request.args.get("offset") or 0
-    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
-                                                        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)
+    return render_xml_dataset(db.Tags, book_id)
 
 
 @opds.route("/opds/series")
 @requires_basic_auth_if_no_ano
 def feed_seriesindex():
-    shift = 0
-    off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(db.Series.sort, 1, 1)).label('id'))\
-        .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters())\
-        .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
-    elements = []
-    if off == 0:
-        elements.append({'id': "00", 'name':_("All")})
-        shift = 1
-    for entry in entries[
-                 off + shift - 1:
-                 int(off + int(config.config_books_per_page) - shift)]:
-        elements.append({'id': entry.id, 'name': entry.id})
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(entries) + 1)
-    return render_xml_template('feed.xml',
-                               letterelements=elements,
-                               folder='opds.feed_letter_series',
-                               pagination=pagination)
+    return render_element_index(db.Series.sort, db.books_series_link, 'opds.feed_letter_series')
+
 
 @opds.route("/opds/series/letter/<book_id>")
 @requires_basic_auth_if_no_ano
@@ -370,7 +280,7 @@ def feed_series(book_id):
 def feed_ratingindex():
     off = request.args.get("offset") or 0
     entries = calibre_db.session.query(db.Ratings, func.count('books_ratings_link.book').label('count'),
-                               (db.Ratings.rating / 2).label('name')) \
+                                       (db.Ratings.rating / 2).label('name')) \
         .join(db.books_ratings_link)\
         .join(db.Books)\
         .filter(calibre_db.common_filters()) \
@@ -388,12 +298,7 @@ def feed_ratingindex():
 @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 = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
-                                                        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)
+    return render_xml_dataset(db.Tags, book_id)
 
 
 @opds.route("/opds/formats")
@@ -491,7 +396,7 @@ def feed_shelf(book_id):
 @requires_basic_auth_if_no_ano
 def opds_download_link(book_id, book_format):
     # I gave up with this: With enabled ldap login, the user doesn't get logged in, therefore it's always guest
-    # workaround, loading the user from the request and checking it's download rights here
+    # workaround, loading the user from the request and checking its download rights here
     # in case of anonymous browsing user is None
     user = load_user_from_request(request) or current_user
     if not user.role_download():
@@ -517,48 +422,6 @@ def get_metadata_calibre_companion(uuid, library):
         return ""
 
 
-def feed_search(term):
-    if term:
-        entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
-        entries_count = len(entries) if len(entries) > 0 else 1
-        pagination = Pagination(1, entries_count, entries_count)
-        items = [entry[0] for entry in entries]
-        return render_xml_template('feed.xml', searchterm=term, entries=items, pagination=pagination)
-    else:
-        return render_xml_template('feed.xml', searchterm="")
-
-
-def check_auth(username, password):
-    try:
-        username = username.encode('windows-1252')
-    except UnicodeEncodeError:
-        username = username.encode('utf-8')
-    user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
-                                            username.decode('utf-8').lower()).first()
-    if bool(user and check_password_hash(str(user.password), password)):
-        return True
-    else:
-        ip_Address = request.headers.get('X-Forwarded-For', request.remote_addr)
-        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_Address)
-        return False
-
-
-def authenticate():
-    return Response(
-        'Could not verify your access level for that URL.\n'
-        'You have to login with proper credentials', 401,
-        {'WWW-Authenticate': 'Basic realm="Login Required"'})
-
-
-def render_xml_template(*args, **kwargs):
-    # 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>")
@@ -582,3 +445,77 @@ def feed_unread_books():
     off = request.args.get("offset") or 0
     result, pagination = render_read_books(int(off) / (int(config.config_books_per_page)) + 1, False, True)
     return render_xml_template('feed.xml', entries=result, pagination=pagination)
+
+
+def feed_search(term):
+    if term:
+        entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
+        entries_count = len(entries) if len(entries) > 0 else 1
+        pagination = Pagination(1, entries_count, entries_count)
+        items = [entry[0] for entry in entries]
+        return render_xml_template('feed.xml', searchterm=term, entries=items, pagination=pagination)
+    else:
+        return render_xml_template('feed.xml', searchterm="")
+
+
+def check_auth(username, password):
+    try:
+        username = username.encode('windows-1252')
+    except UnicodeEncodeError:
+        username = username.encode('utf-8')
+    user = ub.session.query(ub.User).filter(func.lower(ub.User.name) ==
+                                            username.decode('utf-8').lower()).first()
+    if bool(user and check_password_hash(str(user.password), password)):
+        return True
+    else:
+        ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
+        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ip_address)
+        return False
+
+
+def authenticate():
+    return Response(
+        'Could not verify your access level for that URL.\n'
+        'You have to login with proper credentials', 401,
+        {'WWW-Authenticate': 'Basic realm="Login Required"'})
+
+
+def render_xml_template(*args, **kwargs):
+    # 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
+
+
+def render_xml_dataset(data_table, book_id):
+    off = request.args.get("offset") or 0
+    entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
+                                                        db.Books,
+                                                        data_table.any(data_table.id == book_id),
+                                                        [db.Books.timestamp.desc()])
+    return render_xml_template('feed.xml', entries=entries, pagination=pagination)
+
+
+def render_element_index(database_column, linked_table, folder):
+    shift = 0
+    off = int(request.args.get("offset") or 0)
+    entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'))
+    if linked_table:
+        entries = entries.join(linked_table).join(db.Books)
+    entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all()
+    elements = []
+    if off == 0:
+        elements.append({'id': "00", 'name': _("All")})
+        shift = 1
+    for entry in entries[
+                 off + shift - 1:
+                 int(off + int(config.config_books_per_page) - shift)]:
+        elements.append({'id': entry.id, 'name': entry.id})
+    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
+                            len(entries) + 1)
+    return render_xml_template('feed.xml',
+                               letterelements=elements,
+                               folder=folder,
+                               pagination=pagination)
diff --git a/cps/pagination.py b/cps/pagination.py
index 7a9bfb70..bda9f4c8 100644
--- a/cps/pagination.py
+++ b/cps/pagination.py
@@ -57,10 +57,10 @@ class Pagination(object):
     def has_next(self):
         return self.page < self.pages
 
-    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shwn
-    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shwn
-    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shwn
-    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shwn
+    # right_edge: last right_edges count of all pages are shown as number, means, if 10 pages are paginated -> 9,10 shown
+    # left_edge: first left_edges count of all pages are shown as number                                    -> 1,2 shown
+    # left_current: left_current count below current page are shown as number, means if current page 5      -> 3,4 shown
+    # left_current: right_current count above current page are shown as number, means if current page 5     -> 6,7 shown
     def iter_pages(self, left_edge=2, left_current=2,
                    right_current=4, right_edge=2):
         last = 0
diff --git a/cps/remotelogin.py b/cps/remotelogin.py
index a9994f09..ea613c29 100644
--- a/cps/remotelogin.py
+++ b/cps/remotelogin.py
@@ -22,6 +22,7 @@
 
 import json
 from datetime import datetime
+from functools import wraps
 
 from flask import Blueprint, request, make_response, abort, url_for, flash, redirect
 from flask_login import login_required, current_user, login_user
@@ -31,10 +32,6 @@ from sqlalchemy.sql.expression import true
 from . import config, logger, ub
 from .render_template import render_title_template
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
 
 remotelogin = Blueprint('remotelogin', __name__)
 log = logger.create()
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 57470858..98866fd6 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -22,7 +22,7 @@
 
 {%  if source_formats|length > 0 and conversion_formats|length > 0 %}
   <div class="text-center more-stuff"><h4>{{_('Convert book format:')}}</h4>
-      <form class="padded-bottom" action="{{ url_for('editbook.convert_bookformat', book_id=book.id) }}" method="post" id="book_convert_frm">
+      <form class="padded-bottom" action="{{ url_for('edit-book.convert_bookformat', book_id=book.id) }}" method="post" id="book_convert_frm">
           <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
           <div class="form-group">
               <div class="text-left">
@@ -48,7 +48,7 @@
 {% endif %}
 
   </div>
-<form role="form" action="{{ url_for('editbook.edit_book', book_id=book.id) }}" method="post" enctype="multipart/form-data" id="book_edit_frm">
+<form role="form" action="{{ url_for('edit-book.edit_book', book_id=book.id) }}" method="post" enctype="multipart/form-data" id="book_edit_frm">
   <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
   <div class="col-sm-9 col-xs-12">
     <div class="form-group">
diff --git a/cps/templates/book_table.html b/cps/templates/book_table.html
index 4b379b37..9ba173bb 100644
--- a/cps/templates/book_table.html
+++ b/cps/templates/book_table.html
@@ -6,7 +6,7 @@
     data-escape="true"
     {% if g.user.role_edit() %}
         data-editable-type="text"
-        data-editable-url="{{ url_for('editbook.edit_list_book', param=parameter)}}"
+        data-editable-url="{{ url_for('edit-book.edit_list_book', param=parameter)}}"
         data-editable-title="{{ edit_text }}"
         data-edit="true"
         {% if validate %}data-edit-validate="{{ _('This Field is Required') }}" {% endif %}
@@ -66,30 +66,30 @@
             {{ text_table_row('authors', _('Enter Authors'),_('Authors'), true, true) }}
             {{ text_table_row('tags', _('Enter Categories'),_('Categories'), false, true) }}
             {{ text_table_row('series', _('Enter Series'),_('Series'), false, true) }}
-            <th data-field="series_index" id="series_index" data-visible="{{visiblility.get('series_index')}}" data-edit-validate="{{ _('This Field is Required') }}" data-sortable="true" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-min="0" data-editable-url="{{ url_for('editbook.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter Title')}}"{% endif %}>{{_('Series Index')}}</th>
+            <th data-field="series_index" id="series_index" data-visible="{{visiblility.get('series_index')}}" data-edit-validate="{{ _('This Field is Required') }}" data-sortable="true" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-min="0" data-editable-url="{{ url_for('edit-book.edit_list_book', param='series_index')}}" data-edit="true" data-editable-title="{{_('Enter Title')}}"{% endif %}>{{_('Series Index')}}</th>
             {{ text_table_row('languages', _('Enter Languages'),_('Languages'), false, true) }}
             <!--th data-field="pubdate" data-type="date" data-visible="{{visiblility.get('pubdate')}}" data-viewformat="dd.mm.yyyy" id="pubdate" data-sortable="true">{{_('Publishing Date')}}</th-->
             {{ text_table_row('publishers', _('Enter Publishers'),_('Publishers'), false, true) }}
-            <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
+            <th data-field="comments" id="comments" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('comments')}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='comments')}}" data-edit="true" data-editable-title="{{_('Enter comments')}}"{% endif %}>{{_('Comments')}}</th>
             {% if g.user.check_visibility(32768) %}
                 {{ book_checkbox_row('is_archived', _('Archiv Status'), false)}}
             {%  endif %}
             {{ book_checkbox_row('read_status', _('Read Status'), false)}}
             {% for c in cc %}
               {% if c.datatype == "int" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="1" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "rating" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.5" data-editable-step="1" data-editable-min="1" data-editable-max="5" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-formatter="ratingFormatter" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.5" data-editable-step="1" data-editable-min="1" data-editable-max="5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "float" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="number" data-editable-placeholder="1" data-editable-step="0.01" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "enumeration" %}
-                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="select" data-editable-source={{ url_for('editbook.table_get_custom_enum', c_id=c.id)  }} data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="select" data-editable-source={{ url_for('edit-book.table_get_custom_enum', c_id=c.id)  }} data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype in ["datetime"] %}
                   <!-- missing -->
               {% elif c.datatype == "text" %}
                  {{ text_table_row('custom_column_' + c.id|string, _('Enter ') + c.name, c.name, false, false) }}
               {% elif c.datatype == "comments" %}
-                  <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('editbook.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
+                  <th data-field="custom_column_{{ c.id|string }}" id="custom_column_{{ c.id|string }}" data-escape="true" data-editable-mode="popup"  data-visible="{{visiblility.get('custom_column_'+ c.id|string)}}" data-sortable="false" {% if g.user.role_edit() %} data-editable-type="wysihtml5" data-editable-url="{{ url_for('edit-book.edit_list_book', param='custom_column_'+ c.id|string)}}" data-edit="true" data-editable-title="{{_('Enter ') + c.name}}"{% endif %}>{{c.name}}</th>
               {% elif c.datatype == "bool" %}
                   {{ book_checkbox_row('custom_column_' + c.id|string, c.name, false)}}
               {% else %}
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index c2153db8..38005cb9 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -138,7 +138,7 @@
         <p>
         <span class="glyphicon glyphicon-link"></span>
         {% for identifier in entry.identifiers %}
-          <a href="{{identifier}}" target="_blank" class="btn btn-xs btn-success" role="button">{{identifier.formatType()}}</a>
+          <a href="{{identifier}}" target="_blank" class="btn btn-xs btn-success" role="button">{{identifier.format_type()}}</a>
         {%endfor%}
       </p>
       </div>
@@ -295,7 +295,7 @@
       {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
-          <a href="{{ url_for('editbook.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-primary" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
+          <a href="{{ url_for('edit-book.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-primary" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
         </div>
       </div>
       {% endif %}
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index ec69c91b..0d0df778 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -60,7 +60,7 @@
             {% if g.user.is_authenticated or g.allow_anonymous %}
               {% if g.user.role_upload() and g.allow_upload %}
                   <li>
-                    <form id="form-upload" class="navbar-form" action="{{ url_for('editbook.upload') }}" data-title="{{_('Uploading...')}}" data-footer="{{_('Close')}}" data-failed="{{_('Error')}}" data-message="{{_('Upload done, processing, please wait...')}}" method="post" enctype="multipart/form-data">
+                    <form id="form-upload" class="navbar-form" action="{{ url_for('edit-book.upload') }}" data-title="{{_('Uploading...')}}" data-footer="{{_('Close')}}" data-failed="{{_('Error')}}" data-message="{{_('Upload done, processing, please wait...')}}" method="post" enctype="multipart/form-data">
                       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
                       <div class="form-group">
                         <span class="btn btn-default btn-file">{{_('Upload')}}<input id="btn-upload" name="btn-upload"
diff --git a/cps/usermanagement.py b/cps/usermanagement.py
index 71da7701..62fe6f77 100644
--- a/cps/usermanagement.py
+++ b/cps/usermanagement.py
@@ -18,6 +18,7 @@
 
 import base64
 import binascii
+from functools import wraps
 
 from sqlalchemy.sql.expression import func
 from werkzeug.security import check_password_hash
@@ -25,10 +26,6 @@ from flask_login import login_required, login_user
 
 from . import lm, ub, config, constants, services
 
-try:
-    from functools import wraps
-except ImportError:
-    pass  # We're not using Python 3
 
 def login_required_if_no_ano(func):
     @wraps(func)
diff --git a/cps/web.py b/cps/web.py
index 8c057b9d..6f2f1af1 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -29,7 +29,7 @@ import copy
 from functools import wraps
 
 from babel.dates import format_date
-from babel import Locale as LC
+from babel import Locale
 from flask import Blueprint, jsonify
 from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for
 from flask import session as flask_session
@@ -60,7 +60,6 @@ from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
 from .kobo_sync_status import change_archived_books
 
-
 feature_support = {
     'ldap': bool(services.ldap),
     'goodreads': bool(services.goodreads_support),
@@ -69,10 +68,12 @@ feature_support = {
 
 try:
     from .oauth_bb import oauth_check, register_user_with_oauth, logout_oauth_user, get_oauth_status
+
     feature_support['oauth'] = True
 except ImportError:
     feature_support['oauth'] = False
     oauth_check = {}
+    register_user_with_oauth = logout_oauth_user = get_oauth_status = None
 
 try:
     from natsort import natsorted as sort
@@ -82,8 +83,11 @@ except ImportError:
 
 @app.after_request
 def add_security_headers(resp):
-    resp.headers['Content-Security-Policy'] = "default-src 'self'" + ''.join([' '+host for host in config.config_trustedhosts.strip().split(',')]) + " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
-    if request.endpoint == "editbook.edit_book" or config.config_use_google_drive:
+    csp = "default-src 'self'"
+    csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
+    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
+    resp.headers['Content-Security-Policy'] = csp
+    if request.endpoint == "edit-book.edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
     elif request.endpoint == "web.read_book":
         resp.headers['Content-Security-Policy'] += " blob:;style-src-elem 'self' blob: 'unsafe-inline';"
@@ -93,6 +97,7 @@ def add_security_headers(resp):
     resp.headers['Strict-Transport-Security'] = 'max-age=31536000;'
     return resp
 
+
 web = Blueprint('web', __name__)
 log = logger.create()
 
@@ -119,6 +124,7 @@ def viewer_required(f):
 
     return inner
 
+
 # ################################### data provider functions #########################################################
 
 
@@ -140,11 +146,11 @@ def set_bookmark(book_id, book_format):
         ub.session_commit()
         return "", 204
 
-    lbookmark = ub.Bookmark(user_id=current_user.id,
-                            book_id=book_id,
-                            format=book_format,
-                            bookmark_key=bookmark_key)
-    ub.session.merge(lbookmark)
+    l_bookmark = ub.Bookmark(user_id=current_user.id,
+                             book_id=book_id,
+                             format=book_format,
+                             bookmark_key=bookmark_key)
+    ub.session.merge(l_bookmark)
     ub.session_commit("Bookmark for user {} in book {} created".format(current_user.id, book_id))
     return "", 201
 
@@ -162,7 +168,7 @@ def toggle_read(book_id):
 @web.route("/ajax/togglearchived/<int:book_id>", methods=['POST'])
 @login_required
 def toggle_archived(book_id):
-    is_archived = change_archived_books(book_id, message="Book {} archivebit toggled".format(book_id))
+    is_archived = change_archived_books(book_id, message="Book {} archive bit toggled".format(book_id))
     if is_archived:
         remove_synced_book(book_id)
     return ""
@@ -230,6 +236,7 @@ def get_comic_book(book_id, book_format, page):
         return "", 204
 '''
 
+
 # ################################### Typeahead ##################################################################
 
 
@@ -297,6 +304,12 @@ def get_matching_tags():
     return json_dumps
 
 
+def generate_char_list(data_colum, db_link):
+    return (calibre_db.session.query(func.upper(func.substr(data_colum, 1, 1)).label('char'))
+            .join(db_link).join(db.Books).filter(calibre_db.common_filters())
+            .group_by(func.upper(func.substr(data_colum, 1, 1))).all())
+
+
 def get_sort_function(sort_param, data):
     order = [db.Books.timestamp.desc()]
     if sort_param == 'stored':
@@ -373,7 +386,7 @@ def render_books_list(data, sort_param, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order[0],
-        														False, 0,
+                                                                False, 0,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -407,12 +420,13 @@ def render_discover_books(page, book_id):
     else:
         abort(404)
 
+
 def render_hot_books(page, order):
     if current_user.check_visibility(constants.SIDEBAR_HOT):
         if order[1] not in ['hotasc', 'hotdesc']:
-        # Unary expression comparsion only working (for this expression) in sqlalchemy 1.4+
-        #if not (order[0][0].compare(func.count(ub.Downloads.book_id).desc()) or
-        #        order[0][0].compare(func.count(ub.Downloads.book_id).asc())):
+            # Unary expression comparsion only working (for this expression) in sqlalchemy 1.4+
+            # if not (order[0][0].compare(func.count(ub.Downloads.book_id).desc()) or
+            #        order[0][0].compare(func.count(ub.Downloads.book_id).asc())):
             order = [func.count(ub.Downloads.book_id).desc()], 'hotdesc'
         if current_user.show_detail_random():
             random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
@@ -420,19 +434,19 @@ def render_hot_books(page, order):
         else:
             random = false()
         off = int(int(config.config_books_per_page) * (page - 1))
-        all_books = ub.session.query(ub.Downloads, func.count(ub.Downloads.book_id))\
+        all_books = ub.session.query(ub.Downloads, func.count(ub.Downloads.book_id)) \
             .order_by(*order[0]).group_by(ub.Downloads.book_id)
         hot_books = all_books.offset(off).limit(config.config_books_per_page)
         entries = list()
         for book in hot_books:
-            downloadBook = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).filter(
+            download_book = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).filter(
                 db.Books.id == book.Downloads.book_id).first()
-            if downloadBook:
-                entries.append(downloadBook)
+            if download_book:
+                entries.append(download_book)
             else:
                 ub.delete_download(book.Downloads.book_id)
-        numBooks = entries.__len__()
-        pagination = Pagination(page, config.config_books_per_page, numBooks)
+        num_books = entries.__len__()
+        pagination = Pagination(page, config.config_books_per_page, num_books)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Hot Books (Most Downloaded)"), page="hot", order=order[1])
     else:
@@ -462,8 +476,8 @@ def render_downloaded_books(page, order, user_id):
                                                             db.Series,
                                                             ub.Downloads, db.Books.id == ub.Downloads.book_id)
         for book in entries:
-            if not calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
-                             .filter(db.Books.id == book.id).first():
+            if not calibre_db.session.query(db.Books).\
+                                            filter(calibre_db.common_filters()).filter(db.Books.id == book.id).first():
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
         return render_title_template('index.html',
@@ -471,7 +485,7 @@ def render_downloaded_books(page, order, user_id):
                                      entries=entries,
                                      pagination=pagination,
                                      id=user_id,
-                                     title=_(u"Downloaded books by %(user)s",user=user.name),
+                                     title=_(u"Downloaded books by %(user)s", user=user.name),
                                      page="download",
                                      order=order[1])
     else:
@@ -639,29 +653,27 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                         column=config.config_read_column),
                       category="error")
                 return redirect(url_for("web.index"))
-            return [] # ToDo: Handle error Case for opds
+            return []  # ToDo: Handle error Case for opds
 
     if as_xml:
         return entries, pagination
     else:
         if are_read:
             name = _(u'Read Books') + ' (' + str(pagination.total_count) + ')'
-            pagename = "read"
+            page_name = "read"
         else:
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
-            pagename = "unread"
+            page_name = "unread"
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                     title=name, page=pagename, order=order[1])
+                                     title=name, page=page_name, order=order[1])
 
 
 def render_archived_books(page, sort_param):
     order = sort_param[0] 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_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)
@@ -674,40 +686,40 @@ def render_archived_books(page, sort_param):
                                                                                 False, 0)
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
-    pagename = "archived"
+    page_name = "archived"
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
-                                 title=name, page=pagename, order=sort_param[1])
+                                 title=name, page=page_name, order=sort_param[1])
 
 
 def render_prepare_search_form(cc):
     # prepare data for search-form
-    tags = calibre_db.session.query(db.Tags)\
-        .join(db.books_tags_link)\
-        .join(db.Books)\
+    tags = calibre_db.session.query(db.Tags) \
+        .join(db.books_tags_link) \
+        .join(db.Books) \
         .filter(calibre_db.common_filters()) \
-        .group_by(text('books_tags_link.tag'))\
+        .group_by(text('books_tags_link.tag')) \
         .order_by(db.Tags.name).all()
-    series = calibre_db.session.query(db.Series)\
-        .join(db.books_series_link)\
-        .join(db.Books)\
+    series = calibre_db.session.query(db.Series) \
+        .join(db.books_series_link) \
+        .join(db.Books) \
         .filter(calibre_db.common_filters()) \
-        .group_by(text('books_series_link.series'))\
-        .order_by(db.Series.name)\
+        .group_by(text('books_series_link.series')) \
+        .order_by(db.Series.name) \
         .filter(calibre_db.common_filters()).all()
-    shelves = ub.session.query(ub.Shelf)\
-        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id)))\
+    shelves = ub.session.query(ub.Shelf) \
+        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id))) \
         .order_by(ub.Shelf.name).all()
-    extensions = calibre_db.session.query(db.Data)\
-        .join(db.Books)\
+    extensions = calibre_db.session.query(db.Data) \
+        .join(db.Books) \
         .filter(calibre_db.common_filters()) \
-        .group_by(db.Data.format)\
+        .group_by(db.Data.format) \
         .order_by(db.Data.format).all()
     if current_user.filter_language() == u"all":
         languages = calibre_db.speaking_language()
     else:
         languages = None
     return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
-                                 series=series,shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
+                                 series=series, shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
 
 
 def render_search_results(term, offset=None, order=None, limit=None):
@@ -716,7 +728,6 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                                                       offset,
                                                                       order,
                                                                       limit,
-                                                                      False,
                                                                       config.config_read_column,
                                                                       *join)
     return render_title_template('search.html',
@@ -759,12 +770,13 @@ def books_table():
     return render_title_template('book_table.html', title=_(u"Books List"), cc=cc, page="book_table",
                                  visiblility=visibility)
 
+
 @web.route("/ajax/listbooks")
 @login_required
 def list_books():
     off = int(request.args.get("offset") or 0)
     limit = int(request.args.get("limit") or config.config_books_per_page)
-    search = request.args.get("search")
+    search_param = request.args.get("search")
     sort_param = request.args.get("sort", "id")
     order = request.args.get("order", "").lower()
     state = None
@@ -784,8 +796,8 @@ def list_books():
     elif sort_param == "authors":
         order = [db.Authors.name.asc(), db.Series.name, db.Books.series_index] if order == "asc" \
             else [db.Authors.name.desc(), db.Series.name.desc(), db.Books.series_index.desc()]
-        join = db.books_authors_link, db.Books.id == db.books_authors_link.c.book, db.Authors, \
-               db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
+        join = db.books_authors_link, db.Books.id == db.books_authors_link.c.book, db.Authors, db.books_series_link, \
+            db.Books.id == db.books_series_link.c.book, db.Series
     elif sort_param == "languages":
         order = [db.Languages.lang_code.asc()] if order == "asc" else [db.Languages.lang_code.desc()]
         join = db.books_languages_link, db.Books.id == db.books_languages_link.c.book, db.Languages
@@ -794,10 +806,11 @@ def list_books():
     elif not state:
         order = [db.Books.timestamp.desc()]
 
-    total_count = filtered_count = calibre_db.session.query(db.Books).filter(calibre_db.common_filters(allow_show_archived=True)).count()
+    total_count = filtered_count = calibre_db.session.query(db.Books).filter(
+        calibre_db.common_filters(allow_show_archived=True)).count()
     if state is not None:
-        if search:
-            books = calibre_db.search_query(search, config.config_read_column).all()
+        if search_param:
+            books = calibre_db.search_query(search_param, config.config_read_column).all()
             filtered_count = len(books)
         else:
             if not config.config_read_column:
@@ -818,15 +831,14 @@ def list_books():
                     # Skip linking read column and return None instead of read status
                     books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
             books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                          int(current_user.id) == ub.ArchivedBook.user_id))
+                                                           int(current_user.id) == ub.ArchivedBook.user_id))
                      .filter(calibre_db.common_filters(allow_show_archived=True)).all())
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
-    elif search:
-        entries, filtered_count, __ = calibre_db.get_search_results(search,
+    elif search_param:
+        entries, filtered_count, __ = calibre_db.get_search_results(search_param,
                                                                     off,
-                                                                    [order,''],
+                                                                    [order, ''],
                                                                     limit,
-                                                                    True,
                                                                     config.config_read_column,
                                                                     *join)
     else:
@@ -845,9 +857,9 @@ def list_books():
         val = entry[0]
         val.read_status = entry[1] == ub.ReadBook.STATUS_FINISHED
         val.is_archived = entry[2] is True
-        for index in range(0, len(val.languages)):
-            val.languages[index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
-                index].lang_code)
+        for lang_index in range(0, len(val.languages)):
+            val.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
+                lang_index].lang_code)
         result.append(val)
 
     table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": result}
@@ -857,6 +869,7 @@ def list_books():
     response.headers["Content-Type"] = "application/json; charset=utf-8"
     return response
 
+
 @web.route("/ajax/table_settings", methods=['POST'])
 @login_required
 def update_table_settings():
@@ -886,19 +899,18 @@ def author_list():
         entries = calibre_db.session.query(db.Authors, func.count('books_authors_link.book').label('count')) \
             .join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(text('books_authors_link.author')).order_by(order).all()
-        charlist = calibre_db.session.query(func.upper(func.substr(db.Authors.sort, 1, 1)).label('char')) \
-            .join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters()) \
-            .group_by(func.upper(func.substr(db.Authors.sort, 1, 1))).all()
+        char_list = generate_char_list(db.Authors.sort, db.books_authors_link)
         # If not creating a copy, readonly databases can not display authornames with "|" in it as changing the name
         # starts a change session
-        autor_copy = copy.deepcopy(entries)
-        for entry in autor_copy:
+        author_copy = copy.deepcopy(entries)
+        for entry in author_copy:
             entry.Authors.name = entry.Authors.name.replace('|', ',')
-        return render_title_template('list.html', entries=autor_copy, folder='web.books_list', charlist=charlist,
+        return render_title_template('list.html', entries=author_copy, folder='web.books_list', charlist=char_list,
                                      title=u"Authors", page="authorlist", data='author', order=order_no)
     else:
         abort(404)
 
+
 @web.route("/downloadlist")
 @login_required_if_no_ano
 def download_list():
@@ -909,12 +921,12 @@ def download_list():
         order = ub.User.name.asc()
         order_no = 1
     if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD) and current_user.role_admin():
-        entries = ub.session.query(ub.User, func.count(ub.Downloads.book_id).label('count'))\
+        entries = ub.session.query(ub.User, func.count(ub.Downloads.book_id).label('count')) \
             .join(ub.Downloads).group_by(ub.Downloads.user_id).order_by(order).all()
-        charlist = ub.session.query(func.upper(func.substr(ub.User.name, 1, 1)).label('char')) \
+        char_list = ub.session.query(func.upper(func.substr(ub.User.name, 1, 1)).label('char')) \
             .filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS) \
             .group_by(func.upper(func.substr(ub.User.name, 1, 1))).all()
-        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Downloads"), page="downloadlist", data="download", order=order_no)
     else:
         abort(404)
@@ -933,10 +945,8 @@ def publisher_list():
         entries = calibre_db.session.query(db.Publishers, func.count('books_publishers_link.book').label('count')) \
             .join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(text('books_publishers_link.publisher')).order_by(order).all()
-        charlist = calibre_db.session.query(func.upper(func.substr(db.Publishers.name, 1, 1)).label('char')) \
-            .join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
-            .group_by(func.upper(func.substr(db.Publishers.name, 1, 1))).all()
-        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+        char_list = generate_char_list(db.Publishers.name, db.books_publishers_link)
+        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
     else:
         abort(404)
@@ -952,25 +962,19 @@ def series_list():
         else:
             order = db.Series.sort.asc()
             order_no = 1
+        char_list = generate_char_list(db.Series.sort, db.books_series_link)
         if current_user.get_view_property('series', 'series_view') == 'list':
             entries = calibre_db.session.query(db.Series, func.count('books_series_link.book').label('count')) \
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
                 .group_by(text('books_series_link.series')).order_by(order).all()
-            charlist = calibre_db.session.query(func.upper(func.substr(db.Series.sort, 1, 1)).label('char')) \
-                .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
-                .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
-            return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+            return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
             entries = calibre_db.session.query(db.Books, func.count('books_series_link').label('count'),
                                                func.max(db.Books.series_index), db.Books.id) \
-                .join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters())\
+                .join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters()) \
                 .group_by(text('books_series_link.series')).order_by(order).all()
-            charlist = calibre_db.session.query(func.upper(func.substr(db.Series.sort, 1, 1)).label('char')) \
-                .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
-                .group_by(func.upper(func.substr(db.Series.sort, 1, 1))).all()
-
-            return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=charlist,
+            return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
                                          order=order_no)
     else:
@@ -988,7 +992,7 @@ def ratings_list():
             order = db.Ratings.rating.asc()
             order_no = 1
         entries = calibre_db.session.query(db.Ratings, func.count('books_ratings_link.book').label('count'),
-                                   (db.Ratings.rating / 2).label('name')) \
+                                           (db.Ratings.rating / 2).label('name')) \
             .join(db.books_ratings_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(text('books_ratings_link.rating')).order_by(order).all()
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
@@ -1023,14 +1027,14 @@ def formats_list():
 def language_overview():
     if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == u"all":
         order_no = 0 if current_user.get_view_property('language', 'dir') == 'desc' else 1
-        charlist = list()
+        char_list = list()
         languages = calibre_db.speaking_language(reverse_order=not order_no, with_count=True)
         for lang in languages:
             upper_lang = lang[0].name[0].upper()
-            if upper_lang not in charlist:
-                charlist.append(upper_lang)
+            if upper_lang not in char_list:
+                char_list.append(upper_lang)
         return render_title_template('languages.html', languages=languages,
-                                     charlist=charlist, title=_(u"Languages"), page="langlist",
+                                     charlist=char_list, title=_(u"Languages"), page="langlist",
                                      data="language", order=order_no)
     else:
         abort(404)
@@ -1049,10 +1053,8 @@ def category_list():
         entries = calibre_db.session.query(db.Tags, func.count('books_tags_link.book').label('count')) \
             .join(db.books_tags_link).join(db.Books).order_by(order).filter(calibre_db.common_filters()) \
             .group_by(text('books_tags_link.tag')).all()
-        charlist = calibre_db.session.query(func.upper(func.substr(db.Tags.name, 1, 1)).label('char')) \
-            .join(db.books_tags_link).join(db.Books).filter(calibre_db.common_filters()) \
-            .group_by(func.upper(func.substr(db.Tags.name, 1, 1))).all()
-        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=charlist,
+        char_list = generate_char_list(db.Tags.name, db.books_tags_link)
+        return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
     else:
         abort(404)
@@ -1176,7 +1178,15 @@ def adv_search_read_status(q, read_status):
     return q
 
 
-def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
+def adv_search_text(q, include_inputs, exclude_inputs, data_value):
+    for inp in include_inputs:
+        q = q.filter(db.Books.data.any(data_value == inp))
+    for excl in exclude_inputs:
+        q = q.filter(not_(db.Books.data.any(data_value == excl)))
+    return q
+
+
+'''def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
     for extension in include_extension_inputs:
         q = q.filter(db.Books.data.any(db.Data.format == extension))
     for extension in exclude_extension_inputs:
@@ -1197,15 +1207,17 @@ def adv_search_serie(q, include_series_inputs, exclude_series_inputs):
         q = q.filter(db.Books.series.any(db.Series.id == serie))
     for serie in exclude_series_inputs:
         q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
-    return q
+    return q'''
+
 
 def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
-    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)\
+    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id) \
         .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
     if len(include_shelf_inputs) > 0:
         q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
     return q
 
+
 def extend_search_term(searchterm,
                        author_name,
                        book_title,
@@ -1232,7 +1244,7 @@ def extend_search_term(searchterm,
                                            format='medium', locale=get_locale())])
         except ValueError:
             pub_end = u""
-    elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
+    elements = {'tag': db.Tags, 'serie': db.Series, 'shelf': ub.Shelf}
     for key, db_element in elements.items():
         tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
         searchterm.extend(tag.name for tag in tag_names)
@@ -1284,8 +1296,8 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
                                                   int(current_user.id) == ub.ArchivedBook.user_id))
 
-    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
-        .outerjoin(db.Series)\
+    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book) \
+        .outerjoin(db.Series) \
         .filter(calibre_db.common_filters(True))
 
     # parse multiselects to a complete dict
@@ -1311,43 +1323,43 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     if publisher:
         publisher = publisher.strip().lower()
 
-    searchterm = []
+    search_term = []
     cc_present = False
     for c in cc:
         if c.datatype == "datetime":
             column_start = term.get('custom_column_' + str(c.id) + '_start')
             column_end = term.get('custom_column_' + str(c.id) + '_end')
             if column_start:
-                searchterm.extend([u"{} >= {}".format(c.name,
-                                                      format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
-                                                                      format='medium',
-                                                                      locale=get_locale())
-                                                      )])
+                search_term.extend([u"{} >= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
                 cc_present = True
             if column_end:
-                searchterm.extend([u"{} <= {}".format(c.name,
-                                                      format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
-                                                                      format='medium',
-                                                                      locale=get_locale())
-                                                      )])
+                search_term.extend([u"{} <= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
                 cc_present = True
         elif term.get('custom_column_' + str(c.id)):
-            searchterm.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
+            search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
             cc_present = True
 
-
-    if any(tags.values()) or author_name or book_title or publisher or pub_start or pub_end or rating_low \
-       or rating_high or description or cc_present or read_status:
-        searchterm, pub_start, pub_end = extend_search_term(searchterm,
-                                                            author_name,
-                                                            book_title,
-                                                            publisher,
-                                                            pub_start,
-                                                            pub_end,
-                                                            tags,
-                                                            rating_high,
-                                                            rating_low,
-                                                            read_status)
+    if any(tags.values()) or author_name or book_title or \
+        publisher or pub_start or pub_end or rating_low or rating_high \
+            or description or cc_present or read_status:
+        search_term, pub_start, pub_end = extend_search_term(search_term,
+                                                             author_name,
+                                                             book_title,
+                                                             publisher,
+                                                             pub_start,
+                                                             pub_end,
+                                                             tags,
+                                                             rating_high,
+                                                             rating_low,
+                                                             read_status)
         # q = q.filter()
         if author_name:
             q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
@@ -1360,12 +1372,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         q = adv_search_read_status(q, read_status)
         if publisher:
             q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
-        q = adv_search_tag(q, tags['include_tag'], tags['exclude_tag'])
-        q = adv_search_serie(q, tags['include_serie'], tags['exclude_serie'])
+        q = adv_search_text(q, tags['include_tag'], tags['exclude_tag'], db.Tags.id)
+        q = adv_search_text(q, tags['include_serie'], tags['exclude_serie'], db.Series.id)
+        q = adv_search_text(q, tags['include_extension'], tags['exclude_extension'], db.Data.format)
         q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
-        q = adv_search_extension(q, tags['include_extension'], tags['exclude_extension'])
-        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
-        q = adv_search_ratings(q, rating_high, rating_low)
+        q = adv_search_language(q, tags['include_language'], tags['exclude_language'], )
+        q = adv_search_ratings(q, rating_high, rating_low, )
 
         if description:
             q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
@@ -1390,7 +1402,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         limit_all = result_count
     entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
     return render_title_template('search.html',
-                                 adv_searchterm=searchterm,
+                                 adv_searchterm=search_term,
                                  pagination=pagination,
                                  entries=entries,
                                  result_count=result_count,
@@ -1414,10 +1426,12 @@ def advanced_search_form():
 def get_cover(book_id):
     return get_book_cover(book_id)
 
+
 @web.route("/robots.txt")
 def get_robots():
     return send_from_directory(constants.STATIC_DIR, "robots.txt")
 
+
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})
 @web.route("/show/<int:book_id>/<book_format>/<anyname>")
 @login_required_if_no_ano
@@ -1561,7 +1575,7 @@ def login():
                       category="success")
                 return redirect_back(url_for("web.index"))
             elif login_result is None and user and check_password_hash(str(user.password), form['password']) \
-                and user.name != "Guest":
+                    and user.name != "Guest":
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
                 log.info("Local Fallback Login as: '%s'", user.name)
@@ -1573,23 +1587,23 @@ def login():
                 log.info(error)
                 flash(_(u"Could not login: %(message)s", message=error), category="error")
             else:
-                ip_Address = request.headers.get('X-Forwarded-For', request.remote_addr)
-                log.warning('LDAP Login failed for user "%s" IP-address: %s', form['username'], ip_Address)
+                ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
+                log.warning('LDAP Login failed for user "%s" IP-address: %s', form['username'], ip_address)
                 flash(_(u"Wrong Username or Password"), category="error")
         else:
-            ip_Address = request.headers.get('X-Forwarded-For', request.remote_addr)
+            ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
             if 'forgot' in form and form['forgot'] == 'forgot':
                 if user is not None and user.name != "Guest":
                     ret, __ = reset_password(user.id)
                     if ret == 1:
                         flash(_(u"New Password was send to your email address"), category="info")
-                        log.info('Password reset for user "%s" IP-address: %s', form['username'], ip_Address)
+                        log.info('Password reset for user "%s" IP-address: %s', form['username'], ip_address)
                     else:
                         log.error(u"An unknown error occurred. Please try again later")
                         flash(_(u"An unknown error occurred. Please try again later."), category="error")
                 else:
                     flash(_(u"Please enter valid username to reset password"), category="error")
-                    log.warning('Username missing for password reset IP-address: %s', ip_Address)
+                    log.warning('Username missing for password reset IP-address: %s', ip_address)
             else:
                 if user and check_password_hash(str(user.password), form['password']) and user.name != "Guest":
                     login_user(user, remember=bool(form.get('remember_me')))
@@ -1599,7 +1613,7 @@ def login():
                     config.config_is_initial = False
                     return redirect_back(url_for("web.index"))
                 else:
-                    log.warning('Login failed for user "%s" IP-address: %s', form['username'], ip_Address)
+                    log.warning('Login failed for user "%s" IP-address: %s', form['username'], ip_address)
                     flash(_(u"Wrong Username or Password"), category="error")
 
     next_url = request.args.get('next', default=url_for("web.index"), type=str)
@@ -1617,7 +1631,7 @@ def login():
 @login_required
 def logout():
     if current_user is not None and current_user.is_authenticated:
-        ub.delete_user_session(current_user.id, flask_session.get('_id',""))
+        ub.delete_user_session(current_user.id, flask_session.get('_id', ""))
         logout_user()
         if feature_support['oauth'] and (config.config_login_type == 2 or config.config_login_type == 3):
             logout_oauth_user()
@@ -1639,7 +1653,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
             current_user.email = check_email(to_save["email"])
         if current_user.role_admin():
             if to_save.get("name", current_user.name) != current_user.name:
-                # Query User name, if not existing, change
+                # Query username, if not existing, change
                 current_user.name = check_username(to_save["name"])
         current_user.random_books = 1 if to_save.get("show_random") == "on" else 0
         if to_save.get("default_language"):
@@ -1693,7 +1707,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
 @login_required
 def profile():
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [LC('en')]
+    translations = babel.list_translations() + [Locale('en')]
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if feature_support['oauth'] and config.config_login_type == 2:
         oauth_status = get_oauth_status()
@@ -1727,7 +1741,8 @@ def read_book(book_id, book_format):
     book.ordered_authors = calibre_db.order_authors([book], False)
 
     if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
         return redirect(url_for("web.index"))
 
@@ -1768,7 +1783,8 @@ def read_book(book_id, book_format):
                 return render_title_template('readcbr.html', comicfile=all_name, title=title,
                                              extension=fileExt)
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"), category="error")
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
         return redirect(url_for("web.index"))
 
 
@@ -1782,14 +1798,14 @@ def show_book(book_id):
         entry = entries[0]
         entry.read_status = read_book == ub.ReadBook.STATUS_FINISHED
         entry.is_archived = archived_book
-        for index in range(0, len(entry.languages)):
-            entry.languages[index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
-                index].lang_code)
+        for lang_index in range(0, len(entry.languages)):
+            entry.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
+                lang_index].lang_code)
         cc = get_cc_columns(filter_config_custom_read=True)
-        book_in_shelfs = []
+        book_in_shelves = []
         shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
         for sh in shelfs:
-            book_in_shelfs.append(sh.shelf)
+            book_in_shelves.append(sh.shelf)
 
         entry.tags = sort(entry.tags, key=lambda tag: tag.name)
 
@@ -1806,9 +1822,9 @@ def show_book(book_id):
         return render_title_template('detail.html',
                                      entry=entry,
                                      cc=cc,
-                                     is_xhr=request.headers.get('X-Requested-With')=='XMLHttpRequest',
+                                     is_xhr=request.headers.get('X-Requested-With') == 'XMLHttpRequest',
                                      title=entry.title,
-                                     books_shelfs=book_in_shelfs,
+                                     books_shelfs=book_in_shelves,
                                      page="book")
     else:
         log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 04f7bb0c..aea1efb7 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.37.0
+google-api-python-client>=1.7.11,<2.41.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -12,8 +12,8 @@ PyYAML>=3.12
 rsa>=3.4.2,<4.9.0
 
 # Gmail
-google-auth-oauthlib>=0.4.3,<0.5.0
-google-api-python-client>=1.7.11,<2.37.0
+google-auth-oauthlib>=0.4.3,<0.6.0
+google-api-python-client>=1.7.11,<2.41.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
@@ -29,7 +29,7 @@ SQLAlchemy-Utils>=0.33.5,<0.39.0
 
 # metadata extraction
 rarfile>=3.2
-scholarly>=1.2.0,<1.6
+scholarly>=1.2.0,<1.7
 markdown2>=2.0.0,<2.5.0
 html2text>=2020.1.16,<2022.1.1
 python-dateutil>=2.1,<2.9.0
diff --git a/requirements.txt b/requirements.txt
index d9bed7bb..de08fbda 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,7 @@ SQLAlchemy>=1.3.0,<1.5.0
 tornado>=4.1,<6.2
 Wand>=0.4.4,<0.7.0
 unidecode>=0.04.19,<1.4.0
-lxml>=3.8.0,<4.8.0
+lxml>=3.8.0,<4.9.0
 flask-wtf>=0.14.2,<1.1.0
 chardet>=3.0.0,<4.1.0
+advocate>=1.0.0,<1.1.0

From 8f3bb2e3380e93ef940b6aeaefd7713b50277a72 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 14 Mar 2022 17:12:35 +0100
Subject: [PATCH 153/220] Bugfixes from testrun

---
 cps/admin.py                            |   8 +-
 cps/opds.py                             |  10 +-
 cps/web.py                              |  71 +-
 test/Calibre-Web TestSummary_Linux.html | 986 +++++++++++++++---------
 4 files changed, 669 insertions(+), 406 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 5d8ed9c1..fedee340 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -863,10 +863,10 @@ def delete_restriction(res_type, user_id):
             usr = current_user
         if element['id'].startswith('a'):
             usr.allowed_tags = restriction_deletion(element, usr.list_allowed_tags)
-            ub.session_commit("Deleted allowed tags of user {}: {}".format(usr.name, usr.list_allowed_tags))
+            ub.session_commit("Deleted allowed tags of user {}: {}".format(usr.name, element['Element']))
         elif element['id'].startswith('d'):
             usr.denied_tags = restriction_deletion(element, usr.list_denied_tags)
-            ub.session_commit("Deleted denied tags of user {}: {}".format(usr.name, usr.list_allowed_tags))
+            ub.session_commit("Deleted denied tag of user {}: {}".format(usr.name, element['Element']))
     elif res_type == 3:  # Columns per user
         if isinstance(user_id, int):
             usr = ub.session.query(ub.User).filter(ub.User.id == int(user_id)).first()
@@ -875,12 +875,12 @@ def delete_restriction(res_type, user_id):
         if element['id'].startswith('a'):
             usr.allowed_column_value = restriction_deletion(element, usr.list_allowed_column_values)
             ub.session_commit("Deleted allowed columns of user {}: {}".format(usr.name,
-                                                                              usr.list_allowed_column_values))
+                                                                              usr.list_allowed_column_values()))
 
         elif element['id'].startswith('d'):
             usr.denied_column_value = restriction_deletion(element, usr.list_denied_column_values)
             ub.session_commit("Deleted denied columns of user {}: {}".format(usr.name,
-                                                                             usr.list_denied_column_values))
+                                                                             usr.list_denied_column_values()))
     return ""
 
 
diff --git a/cps/opds.py b/cps/opds.py
index c0637c6b..c8ccdea9 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -26,7 +26,7 @@ from functools import wraps
 
 from flask import Blueprint, request, render_template, Response, g, make_response, abort
 from flask_login import current_user
-from sqlalchemy.sql.expression import func, text, or_, and_, true
+from sqlalchemy.sql.expression import func, text, or_, and_, any_, true
 from werkzeug.security import check_password_hash
 from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages
 from .helper import get_download_link, get_book_cover
@@ -34,7 +34,7 @@ from .pagination import Pagination
 from .web import render_read_books
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
-
+from sqlalchemy.orm import InstrumentedAttribute
 opds = Blueprint('opds', __name__)
 
 log = logger.create()
@@ -298,7 +298,7 @@ def feed_ratingindex():
 @opds.route("/opds/ratings/<book_id>")
 @requires_basic_auth_if_no_ano
 def feed_ratings(book_id):
-    return render_xml_dataset(db.Tags, book_id)
+    return render_xml_dataset(db.Ratings, book_id)
 
 
 @opds.route("/opds/formats")
@@ -493,7 +493,7 @@ def render_xml_dataset(data_table, book_id):
     off = request.args.get("offset") or 0
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
-                                                        data_table.any(data_table.id == book_id),
+                                                        getattr(db.Books, data_table.__tablename__).any(data_table.id == book_id),
                                                         [db.Books.timestamp.desc()])
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -502,7 +502,7 @@ def render_element_index(database_column, linked_table, folder):
     shift = 0
     off = int(request.args.get("offset") or 0)
     entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'))
-    if linked_table:
+    if linked_table is not None:
         entries = entries.join(linked_table).join(db.Books)
     entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all()
     elements = []
diff --git a/cps/web.py b/cps/web.py
index 6f2f1af1..b1f27035 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1129,27 +1129,6 @@ def adv_search_custom_columns(cc, term, q):
     return q
 
 
-def adv_search_language(q, include_languages_inputs, exclude_languages_inputs):
-    if current_user.filter_language() != "all":
-        q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
-    else:
-        for language in include_languages_inputs:
-            q = q.filter(db.Books.languages.any(db.Languages.id == language))
-        for language in exclude_languages_inputs:
-            q = q.filter(not_(db.Books.series.any(db.Languages.id == language)))
-    return q
-
-
-def adv_search_ratings(q, rating_high, rating_low):
-    if rating_high:
-        rating_high = int(rating_high) * 2
-        q = q.filter(db.Books.ratings.any(db.Ratings.rating <= rating_high))
-    if rating_low:
-        rating_low = int(rating_low) * 2
-        q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low))
-    return q
-
-
 def adv_search_read_status(q, read_status):
     if read_status:
         if config.config_read_column:
@@ -1178,38 +1157,32 @@ def adv_search_read_status(q, read_status):
     return q
 
 
-def adv_search_text(q, include_inputs, exclude_inputs, data_value):
+def adv_search_language(q, include_languages_inputs, exclude_languages_inputs):
+    if current_user.filter_language() != "all":
+        q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
+    else:
+        return adv_search_text(q, include_languages_inputs, exclude_languages_inputs, db.Languages.id)
+    return q
+
+
+def adv_search_ratings(q, rating_high, rating_low):
+    if rating_high:
+        rating_high = int(rating_high) * 2
+        q = q.filter(db.Books.ratings.any(db.Ratings.rating <= rating_high))
+    if rating_low:
+        rating_low = int(rating_low) * 2
+        q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low))
+    return q
+
+
+def adv_search_text(q, include_inputs, exclude_inputs, data_table):
     for inp in include_inputs:
-        q = q.filter(db.Books.data.any(data_value == inp))
+        q = q.filter(getattr(db.Books, data_table.class_.__tablename__).any(data_table == inp))
     for excl in exclude_inputs:
-        q = q.filter(not_(db.Books.data.any(data_value == excl)))
+        q = q.filter(not_(getattr(db.Books, data_table.class_.__tablename__).any(data_table == excl)))
     return q
 
 
-'''def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
-    for extension in include_extension_inputs:
-        q = q.filter(db.Books.data.any(db.Data.format == extension))
-    for extension in exclude_extension_inputs:
-        q = q.filter(not_(db.Books.data.any(db.Data.format == extension)))
-    return q
-
-
-def adv_search_tag(q, include_tag_inputs, exclude_tag_inputs):
-    for tag in include_tag_inputs:
-        q = q.filter(db.Books.tags.any(db.Tags.id == tag))
-    for tag in exclude_tag_inputs:
-        q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
-    return q
-
-
-def adv_search_serie(q, include_series_inputs, exclude_series_inputs):
-    for serie in include_series_inputs:
-        q = q.filter(db.Books.series.any(db.Series.id == serie))
-    for serie in exclude_series_inputs:
-        q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
-    return q'''
-
-
 def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
     q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id) \
         .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
@@ -1376,7 +1349,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         q = adv_search_text(q, tags['include_serie'], tags['exclude_serie'], db.Series.id)
         q = adv_search_text(q, tags['include_extension'], tags['exclude_extension'], db.Data.format)
         q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
-        q = adv_search_language(q, tags['include_language'], tags['exclude_language'], )
+        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
         q = adv_search_ratings(q, rating_high, rating_low, )
 
         if description:
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 580cf3c9..b2de4c81 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-03-12 22:57:13</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-13 21:32:38</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>2022-03-13 03:46:17</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-14 02:20: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>Duration: </strong>4h 0 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 59 min</p>
         </div>
       </div>
       </div>
@@ -363,11 +363,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestCoverEditBooks</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -386,11 +386,31 @@
     
     
     
-        <tr id='pt4.2' class='hiddenRow bg-success'>
+        <tr id="ft4.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</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_ft4.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft4.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft4.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cover_edit_books.py&#34;, line 56, in test_upload_jpg
+    self.assertTrue(&#34;Error Downloading Cover&#34; in self.check_element_on_page((By.ID, &#34;flash_danger&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -681,11 +701,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -704,11 +724,33 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id="ft9.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</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_ft9.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft9.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 213, in test_convert_only
+    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
+AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
+- Failed
++ Finished</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1586,12 +1628,12 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">17</td>
+        <td class="text-center">16</td>
         <td class="text-center">3</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c16', 20)">Detail</a>
@@ -1609,11 +1651,41 @@
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id="et16.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</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_et16.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et16.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 402, in test_edit_author
+    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1761,7 +1833,7 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 865, in test_upload_book_epub
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 868, in test_upload_book_epub
     self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
 AssertionError: &#39;8936&#39; != &#39;1103&#39;
 - 8936
@@ -1801,7 +1873,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 778, in test_upload_cover_hdd
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 781, in test_upload_cover_hdd
     self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
@@ -1830,9 +1902,9 @@ AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 947, in test_watch_metadata
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 950, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=4a23d5c4-e97a-42e1-bd43-351fb1de43df&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=f66a16a8-b9e1-446d-b1ad-21b11df67753&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2891,12 +2963,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestOPDSFeed</td>
         <td class="text-center">23</td>
-        <td class="text-center">23</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">4</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c33', 23)">Detail</a>
@@ -2905,20 +2977,62 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id="ft33.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</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_ft33.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 60, in test_opds
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id="et33.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</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_et33.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 339, in test_opds_author
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2977,11 +3091,31 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id="ft33.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</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_ft33.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 100, in test_opds_guest_user
+    self.assertEqual(200, r.status_code)
+AssertionError: 200 != 500</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3004,20 +3138,62 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id="ft33.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</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_ft33.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 375, in test_opds_non_admin
+    self.assertEqual(401, r.status_code)
+AssertionError: 401 != 200</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id="et33.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</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_et33.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 286, in test_opds_publisher
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3031,11 +3207,33 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id="et33.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</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_et33.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 435, in test_opds_ratings
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3049,20 +3247,62 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id="ft33.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</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_ft33.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 563, in test_opds_search
+    self.assertEqual(401, r.status_code)
+AssertionError: 401 != 200</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id="et33.18" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</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_et33.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 260, in test_opds_series
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3076,11 +3316,33 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id="et33.20" class="none bg-info">
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</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_et33.20')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et33.20" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et33.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 297, in test_opds_tags
+    entries = self.get_opds_feed(r.text)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
+    ret[&#39;len&#39;] = key
+UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3113,12 +3375,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestUploadPDF</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c34', 1)">Detail</a>
@@ -3127,144 +3389,34 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id="et34.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
-        <td>TestReader</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c35', 5)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt35.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestReader - test_comic_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt35.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestReader - test_epub_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt35.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestReader - test_pdf_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="ft35.4" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestReader - test_sound_listener</div>
+                <div class='testcase'>tearDownClass (test_opds_feed)</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft35.4')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et34.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft35.4" class="popup_window test_output" style="display:block;">
+                <div id="div_et34.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft35.4').style.display='none'"><span
+                                onclick="document.getElementById('div_et34.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 216, in sound_test
-    self.assertEqual(title, title_item.text)
-AssertionError: &#39;Unknown - music&#39; != &#39;- music&#39;
-- Unknown - music
-+ - music</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt35.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestReader - test_txt_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>TestReadOnlyDatabase</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et36.1" class="none bg-info">
-            <td>
-                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_readonly_db.py&#34;, line 49, in test_readonly_path
-    self.fill_basic_config({&#39;config_rarfile_location&#39;: unrar_path(), &#34;config_unicode_filename&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 346, in _fill_basic_config
-    ele = cls.driver.find_element(By.ID, key)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 33, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
     return self.execute(Command.FIND_ELEMENT, {
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
     self.error_handler.check_response(response)
   File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
     raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;config_rarfile_location&#34;]
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
 Stacktrace:
 WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
 NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
@@ -3280,7 +3432,91 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
 
     <tr id="su" class="passClass">
-        <td>TestReconnect</td>
+        <td>TestUploadPDF</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c35', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt35.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReader</td>
+        <td class="text-center">5</td>
+        <td class="text-center">5</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('c36', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt36.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_comic_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_epub_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_pdf_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_sound_listener</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_txt_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReadOnlyDatabase</td>
         <td class="text-center">1</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
@@ -3294,6 +3530,30 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
         <tr id='pt37.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestReconnect</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c38', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3311,13 +3571,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3326,7 +3586,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3335,7 +3595,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3344,7 +3604,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3353,7 +3613,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3362,7 +3622,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3371,7 +3631,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3380,7 +3640,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3398,13 +3658,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3413,7 +3673,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3422,7 +3682,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3432,21 +3692,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestShelf</td>
         <td class="text-center">16</td>
-        <td class="text-center">15</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3455,7 +3715,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3464,16 +3724,36 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id="ft41.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</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_ft41.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 530, in test_adv_search_shelf
+    self.assertEqual(len(self.adv_search({u&#39;include_shelf&#39;: u&#39;Search&#39;, &#39;include_tag&#39;: &#39;Gênot&#39;})), 2)
+AssertionError: 3 != 2</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3482,7 +3762,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3491,7 +3771,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3500,7 +3780,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3509,7 +3789,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3518,7 +3798,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3527,7 +3807,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3536,7 +3816,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3545,7 +3825,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3554,7 +3834,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3563,19 +3843,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st41.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.14" 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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3589,7 +3869,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3598,7 +3878,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3616,13 +3896,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 9)">Detail</a>
+            <a onclick="showClassDetail('c42', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3631,7 +3911,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3640,7 +3920,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3649,7 +3929,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3658,7 +3938,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3667,7 +3947,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3676,19 +3956,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st41.7" class="none bg-warning">
+        <tr id="st42.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st41.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3702,7 +3982,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3711,7 +3991,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3723,19 +4003,37 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
 
     <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
+        <td class="text-center">4</td>
+        <td class="text-center">4</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('c42', 2)">Detail</a>
+            <a onclick="showClassDetail('c43', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt43.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3744,7 +4042,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3754,21 +4052,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestUserList</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
-        <td class="text-center">1</td>
+        <td class="text-center">18</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('c43', 18)">Detail</a>
+            <a onclick="showClassDetail('c44', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3777,7 +4075,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3786,7 +4084,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3795,7 +4093,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3804,7 +4102,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3813,7 +4111,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3822,7 +4120,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3831,7 +4129,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3840,7 +4138,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3849,7 +4147,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3858,7 +4156,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3867,7 +4165,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3876,7 +4174,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3885,7 +4183,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3894,7 +4192,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3903,36 +4201,16 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft43.16" class="none bg-danger">
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_user_list.py&#34;, line 640, in test_user_list_requests
-    self.assertEqual(400, result.status_code)
-AssertionError: 400 != 500</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3941,7 +4219,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3959,13 +4237,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 1)">Detail</a>
+            <a onclick="showClassDetail('c45', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3983,13 +4261,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 21)">Detail</a>
+            <a onclick="showClassDetail('c46', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3998,7 +4276,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4007,7 +4285,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4016,7 +4294,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4025,7 +4303,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4034,7 +4312,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4043,7 +4321,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4052,7 +4330,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4061,7 +4339,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4070,7 +4348,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4079,7 +4357,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4088,7 +4366,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4097,7 +4375,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4106,7 +4384,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4115,7 +4393,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4124,7 +4402,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4133,7 +4411,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4142,7 +4420,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4151,7 +4429,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4160,7 +4438,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4169,7 +4447,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4187,13 +4465,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 34)">Detail</a>
+            <a onclick="showClassDetail('c47', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4202,7 +4480,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4211,7 +4489,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4220,7 +4498,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4229,7 +4507,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4238,7 +4516,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4247,7 +4525,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4256,7 +4534,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4265,7 +4543,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4274,7 +4552,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4283,7 +4561,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4292,7 +4570,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4301,7 +4579,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4310,7 +4588,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4319,7 +4597,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4328,7 +4606,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4337,7 +4615,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4346,7 +4624,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4355,7 +4633,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4364,7 +4642,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4373,7 +4651,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4382,7 +4660,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.22' class='hiddenRow bg-success'>
+        <tr id='pt47.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4391,7 +4669,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.23' class='hiddenRow bg-success'>
+        <tr id='pt47.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4400,7 +4678,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.24' class='hiddenRow bg-success'>
+        <tr id='pt47.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4409,7 +4687,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.25' class='hiddenRow bg-success'>
+        <tr id='pt47.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4418,7 +4696,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.26' class='hiddenRow bg-success'>
+        <tr id='pt47.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4427,7 +4705,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.27' class='hiddenRow bg-success'>
+        <tr id='pt47.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4436,7 +4714,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.28' class='hiddenRow bg-success'>
+        <tr id='pt47.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4445,7 +4723,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.29' class='hiddenRow bg-success'>
+        <tr id='pt47.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4454,7 +4732,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.30' class='hiddenRow bg-success'>
+        <tr id='pt47.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4463,7 +4741,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.31' class='hiddenRow bg-success'>
+        <tr id='pt47.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4472,7 +4750,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.32' class='hiddenRow bg-success'>
+        <tr id='pt47.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4481,7 +4759,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.33' class='hiddenRow bg-success'>
+        <tr id='pt47.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4490,7 +4768,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt46.34' class='hiddenRow bg-success'>
+        <tr id='pt47.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4508,13 +4786,13 @@ AssertionError: 400 != 500</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 16)">Detail</a>
+            <a onclick="showClassDetail('c48', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4523,7 +4801,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4532,7 +4810,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4541,7 +4819,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4550,7 +4828,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4559,7 +4837,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4568,7 +4846,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4577,7 +4855,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4586,7 +4864,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4595,7 +4873,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4604,7 +4882,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4613,7 +4891,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4622,7 +4900,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4631,7 +4909,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4640,7 +4918,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4649,7 +4927,7 @@ AssertionError: 400 != 500</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4660,10 +4938,10 @@ AssertionError: 400 != 500</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>403</td>
-        <td>391</td>
-        <td>5</td>
-        <td>1</td>
+        <td>406</td>
+        <td>383</td>
+        <td>10</td>
+        <td>7</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4702,6 +4980,12 @@ AssertionError: 400 != 500</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>advocate</th>
+              <td>1.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>Babel</th>
               <td>2.9.1</td>
@@ -4770,7 +5054,13 @@ AssertionError: 400 != 500</pre>
           
             <tr>
               <th>lxml</th>
-              <td>4.7.1</td>
+              <td>4.8.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>pyasn1</th>
+              <td>0.4.8</td>
               <td>Basic</td>
             </tr>
           
@@ -5094,7 +5384,7 @@ AssertionError: 400 != 500</pre>
 </div>
 
 <script>
-    drawCircle(391, 5, 1, 6);
+    drawCircle(383, 10, 7, 6);
     showCase(5);
 </script>
 

From 399ddc5d6f036f5ca160b3bbea815d01f5118982 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 15 Mar 2022 18:44:36 +0100
Subject: [PATCH 154/220] Update testresults

---
 cps/helper.py                           |  10 +-
 test/Calibre-Web TestSummary_Linux.html | 760 +++++++-----------------
 2 files changed, 217 insertions(+), 553 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 3b0c2a04..4dabcfce 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -738,16 +738,18 @@ def save_cover_from_url(url, book_path):
         return save_cover(img, book_path)
     except (socket.gaierror,
             requests.exceptions.HTTPError,
+            requests.exceptions.InvalidURL,
             requests.exceptions.ConnectionError,
             requests.exceptions.Timeout) as ex:
-        log.info(u'Cover Download Error %s', ex)
+        # "Invalid host" can be the result of a redirect response
+        log.error(u'Cover Download Error %s', ex)
         return False, _("Error Downloading Cover")
     except MissingDelegateError as ex:
         log.info(u'File Format Error %s', ex)
         return False, _("Cover Format Error")
-    except UnacceptableAddressException:
-        log.error("Localhost was accessed for cover upload")
-        return False, _("You are not allowed to access localhost for cover uploads")
+    except UnacceptableAddressException as e:
+        log.error("Localhost or local network was accessed for cover upload")
+        return False, _("You are not allowed to access localhost or the local network for cover uploads")
 
 
 def save_cover_from_filestorage(filepath, saved_filename, img):
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index b2de4c81..e3b7a3d7 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-03-13 21:32:38</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-14 21:13:33</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>2022-03-14 02:20:13</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-15 02:05:20</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>3h 59 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 3 min</p>
         </div>
       </div>
       </div>
@@ -363,11 +363,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCoverEditBooks</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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">
@@ -386,31 +386,11 @@
     
     
     
-        <tr id="ft4.2" class="none bg-danger">
+        <tr id='pt4.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft4.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft4.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft4.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cover_edit_books.py&#34;, line 56, in test_upload_jpg
-    self.assertTrue(&#34;Error Downloading Cover&#34; in self.check_element_on_page((By.ID, &#34;flash_danger&#34;)).text)
-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>
     
     
@@ -701,11 +681,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</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">
@@ -724,33 +704,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft9.2" class="none bg-danger">
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft9.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 213, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
-- Failed
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1628,12 +1586,12 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">16</td>
+        <td class="text-center">17</td>
         <td class="text-center">3</td>
-        <td class="text-center">1</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c16', 20)">Detail</a>
@@ -1651,41 +1609,11 @@ AssertionError: &#39;Failed&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="et16.2" class="none bg-info">
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 402, in test_edit_author
-    self.fill_basic_config({&#34;config_unicode_filename&#34;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1833,7 +1761,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 868, in test_upload_book_epub
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 853, in test_upload_book_epub
     self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
 AssertionError: &#39;8936&#39; != &#39;1103&#39;
 - 8936
@@ -1873,7 +1801,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 781, in test_upload_cover_hdd
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 766, in test_upload_cover_hdd
     self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
@@ -1902,9 +1830,9 @@ AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 950, in test_watch_metadata
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 935, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=f66a16a8-b9e1-446d-b1ad-21b11df67753&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=2e081d1c-86d2-461f-a309-e51e1e378161&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2963,12 +2891,12 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestOPDSFeed</td>
         <td class="text-center">23</td>
-        <td class="text-center">14</td>
-        <td class="text-center">4</td>
-        <td class="text-center">5</td>
+        <td class="text-center">23</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('c33', 23)">Detail</a>
@@ -2977,62 +2905,20 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     
     
-        <tr id="ft33.1" class="none bg-danger">
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 60, in test_opds
-    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="et33.2" class="none bg-info">
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 339, in test_opds_author
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3091,31 +2977,11 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="ft33.9" class="none bg-danger">
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 100, in test_opds_guest_user
-    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>
     
     
@@ -3138,62 +3004,20 @@ AssertionError: 200 != 500</pre>
     
     
     
-        <tr id="ft33.12" class="none bg-danger">
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.12')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 375, in test_opds_non_admin
-    self.assertEqual(401, r.status_code)
-AssertionError: 401 != 200</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et33.13" class="none bg-info">
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 286, in test_opds_publisher
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3207,33 +3031,11 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="et33.15" class="none bg-info">
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 435, in test_opds_ratings
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3247,62 +3049,20 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="ft33.17" class="none bg-danger">
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 563, in test_opds_search
-    self.assertEqual(401, r.status_code)
-AssertionError: 401 != 200</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et33.18" class="none bg-info">
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 260, in test_opds_series
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3316,33 +3076,11 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
     
     
-        <tr id="et33.20" class="none bg-info">
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et33.20')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et33.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et33.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 297, in test_opds_tags
-    entries = self.get_opds_feed(r.text)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1159, in get_opds_feed
-    ret[&#39;len&#39;] = key
-UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3375,62 +3113,6 @@ UnboundLocalError: local variable &#39;key&#39; referenced before assignment</pr
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et34.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_opds_feed)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et34.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et34.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et34.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_opds_feed.py&#34;, line 33, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
     <tr id="su" class="passClass">
         <td>TestUploadPDF</td>
         <td class="text-center">1</td>
@@ -3439,13 +3121,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3463,13 +3145,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 5)">Detail</a>
+            <a onclick="showClassDetail('c35', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3478,7 +3160,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3487,7 +3169,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3496,7 +3178,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3505,7 +3187,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3523,13 +3205,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3547,13 +3229,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3571,13 +3253,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3586,7 +3268,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3595,7 +3277,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3604,7 +3286,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3613,7 +3295,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3622,7 +3304,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3631,7 +3313,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3640,7 +3322,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3658,13 +3340,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3673,7 +3355,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3682,7 +3364,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3692,21 +3374,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestShelf</td>
         <td class="text-center">16</td>
-        <td class="text-center">14</td>
-        <td class="text-center">1</td>
+        <td class="text-center">15</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('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3715,7 +3397,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3724,36 +3406,16 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft41.3" class="none bg-danger">
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_shelf.py&#34;, line 530, in test_adv_search_shelf
-    self.assertEqual(len(self.adv_search({u&#39;include_shelf&#39;: u&#39;Search&#39;, &#39;include_tag&#39;: &#39;Gênot&#39;})), 2)
-AssertionError: 3 != 2</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3762,7 +3424,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3771,7 +3433,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3780,7 +3442,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3789,7 +3451,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3798,7 +3460,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3807,7 +3469,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3816,7 +3478,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3825,7 +3487,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3834,7 +3496,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3843,19 +3505,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st41.14" class="none bg-warning">
+        <tr id="st40.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.14" 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_st41.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3869,7 +3531,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3878,7 +3540,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3896,13 +3558,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 9)">Detail</a>
+            <a onclick="showClassDetail('c41', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3911,7 +3573,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3920,7 +3582,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3929,7 +3591,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3938,7 +3600,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3947,7 +3609,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3956,19 +3618,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st42.7" class="none bg-warning">
+        <tr id="st41.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st42.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3982,7 +3644,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3991,7 +3653,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -4009,13 +3671,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 4)">Detail</a>
+            <a onclick="showClassDetail('c42', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -4024,7 +3686,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -4033,7 +3695,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4042,7 +3704,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4060,13 +3722,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 18)">Detail</a>
+            <a onclick="showClassDetail('c43', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4075,7 +3737,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4084,7 +3746,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4093,7 +3755,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4102,7 +3764,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4111,7 +3773,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4120,7 +3782,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4129,7 +3791,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4138,7 +3800,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4147,7 +3809,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4156,7 +3818,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4165,7 +3827,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4174,7 +3836,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4183,7 +3845,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4192,7 +3854,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4201,7 +3863,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4210,7 +3872,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4219,7 +3881,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4237,13 +3899,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 1)">Detail</a>
+            <a onclick="showClassDetail('c44', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4261,13 +3923,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 21)">Detail</a>
+            <a onclick="showClassDetail('c45', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4276,7 +3938,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4285,7 +3947,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4294,7 +3956,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4303,7 +3965,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4312,7 +3974,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4321,7 +3983,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4330,7 +3992,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4339,7 +4001,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4348,7 +4010,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4357,7 +4019,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4366,7 +4028,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4375,7 +4037,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4384,7 +4046,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4393,7 +4055,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4402,7 +4064,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4411,7 +4073,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4420,7 +4082,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4429,7 +4091,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4438,7 +4100,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4447,7 +4109,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4465,13 +4127,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 34)">Detail</a>
+            <a onclick="showClassDetail('c46', 34)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4480,7 +4142,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4489,7 +4151,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4498,7 +4160,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4507,7 +4169,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4516,7 +4178,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4525,7 +4187,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4534,7 +4196,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4543,7 +4205,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4552,7 +4214,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4561,7 +4223,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4570,7 +4232,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4579,7 +4241,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4588,7 +4250,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4597,7 +4259,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4606,7 +4268,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4615,7 +4277,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4624,7 +4286,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4633,7 +4295,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4642,7 +4304,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4651,7 +4313,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4660,7 +4322,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.22' class='hiddenRow bg-success'>
+        <tr id='pt46.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4669,7 +4331,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.23' class='hiddenRow bg-success'>
+        <tr id='pt46.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4678,7 +4340,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.24' class='hiddenRow bg-success'>
+        <tr id='pt46.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4687,7 +4349,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.25' class='hiddenRow bg-success'>
+        <tr id='pt46.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4696,7 +4358,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.26' class='hiddenRow bg-success'>
+        <tr id='pt46.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4705,7 +4367,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.27' class='hiddenRow bg-success'>
+        <tr id='pt46.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4714,7 +4376,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.28' class='hiddenRow bg-success'>
+        <tr id='pt46.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4723,7 +4385,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.29' class='hiddenRow bg-success'>
+        <tr id='pt46.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4732,7 +4394,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.30' class='hiddenRow bg-success'>
+        <tr id='pt46.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4741,7 +4403,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.31' class='hiddenRow bg-success'>
+        <tr id='pt46.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4750,7 +4412,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.32' class='hiddenRow bg-success'>
+        <tr id='pt46.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4759,7 +4421,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.33' class='hiddenRow bg-success'>
+        <tr id='pt46.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4768,7 +4430,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt47.34' class='hiddenRow bg-success'>
+        <tr id='pt46.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4786,13 +4448,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 16)">Detail</a>
+            <a onclick="showClassDetail('c47', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4801,7 +4463,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4810,7 +4472,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4819,7 +4481,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4828,7 +4490,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4837,7 +4499,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4846,7 +4508,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4855,7 +4517,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4864,7 +4526,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4873,7 +4535,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4882,7 +4544,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4891,7 +4553,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4900,7 +4562,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4909,7 +4571,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4918,7 +4580,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4927,7 +4589,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4938,10 +4600,10 @@ AssertionError: 3 != 2</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>406</td>
-        <td>383</td>
-        <td>10</td>
-        <td>7</td>
+        <td>405</td>
+        <td>396</td>
+        <td>3</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -5384,7 +5046,7 @@ AssertionError: 3 != 2</pre>
 </div>
 
 <script>
-    drawCircle(383, 10, 7, 6);
+    drawCircle(396, 3, 0, 6);
     showCase(5);
 </script>
 

From 57cd8160a05e5297ce78509f0c28538415749854 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 16:28:58 +0100
Subject: [PATCH 155/220] Removed accidently added line regarding
 "InstrumentedAttribute"

---
 cps/opds.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cps/opds.py b/cps/opds.py
index c8ccdea9..180fcacb 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -34,7 +34,6 @@ from .pagination import Pagination
 from .web import render_read_books
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
-from sqlalchemy.orm import InstrumentedAttribute
 opds = Blueprint('opds', __name__)
 
 log = logger.create()

From 034ab73ccc9e209d5fea6ea9a81a351700c63fc8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 16:57:18 +0100
Subject: [PATCH 156/220] Added environment variables for reconnect

---
 cps/admin.py       |  2 +-
 cps/cli.py         |  6 +++++-
 cps/gdriveutils.py | 20 +++++++-------------
 cps/helper.py      |  9 +++------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index fedee340..0b90327e 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -159,7 +159,7 @@ def shutdown():
 # needed for docker applications, as changes on metadata.db from host are not visible to application
 @admi.route("/reconnect", methods=['GET'])
 def reconnect():
-    if cli.args.r:
+    if cli.reconnect_enable:
         calibre_db.reconnect_db(config, ub.app_DB_path)
         return json.dumps({})
     else:
diff --git a/cps/cli.py b/cps/cli.py
index a63d7282..36c03513 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -84,10 +84,14 @@ if args.k == "":
 
 # dry run updater
 dry_run = args.d or None
+# enable reconnect endpoint for docker database reconnect
+reconnect_enable = args.r or os.environ.get("CALIBRE_RECONNECT", None)
 # load covers from localhost
-allow_localhost = args.l or None
+allow_localhost = args.l or os.environ.get("CALIBRE_LOCALHOST", None)
 # handle and check ip address argument
 ip_address = args.i or None
+
+
 if ip_address:
     try:
         # try to parse the given ip address with socket
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 0b704db4..e75f3742 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -81,7 +81,7 @@ if gdrive_support:
     if not logger.is_debug_enabled():
         logger.get('googleapiclient.discovery').setLevel(logger.logging.ERROR)
 else:
-    log.debug("Cannot import pydrive,httplib2, using gdrive will not work: %s", importError)
+    log.debug("Cannot import pydrive, httplib2, using gdrive will not work: %s", importError)
 
 
 class Singleton:
@@ -272,8 +272,7 @@ def getEbooksFolderId(drive=None):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error("gdrive.db DB is not Writeable")
-            log.debug('Database error: %s', ex)
+            log.error_or_exception('Database error: %s', ex)
             session.rollback()
         return gDriveId.gdrive_id
 
@@ -322,8 +321,7 @@ def getFolderId(path, drive):
         else:
             currentFolderId = storedPathName.gdrive_id
     except OperationalError as ex:
-        log.error("gdrive.db DB is not Writeable")
-        log.debug('Database error: %s', ex)
+        log.error_or_exception('Database error: %s', ex)
         session.rollback()
     except ApiRequestError as ex:
         log.error('{} {}'.format(ex.error['message'], path))
@@ -547,8 +545,7 @@ def deleteDatabaseOnChange():
         session.commit()
     except (OperationalError, InvalidRequestError) as ex:
         session.rollback()
-        log.debug('Database error: %s', ex)
-        log.error(u"GDrive DB is not Writeable")
+        log.error_or_exception('Database error: %s', ex)
 
 
 def updateGdriveCalibreFromLocal():
@@ -566,8 +563,7 @@ def updateDatabaseOnEdit(ID,newPath):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error("gdrive.db DB is not Writeable")
-            log.debug('Database error: %s', ex)
+            log.error_or_exception('Database error: %s', ex)
             session.rollback()
 
 
@@ -577,8 +573,7 @@ def deleteDatabaseEntry(ID):
     try:
         session.commit()
     except OperationalError as ex:
-        log.error("gdrive.db DB is not Writeable")
-        log.debug('Database error: %s', ex)
+        log.error_or_exception('Database error: %s', ex)
         session.rollback()
 
 
@@ -599,8 +594,7 @@ def get_cover_via_gdrive(cover_path):
             try:
                 session.commit()
             except OperationalError as ex:
-                log.error("gdrive.db DB is not Writeable")
-                log.debug('Database error: %s', ex)
+                log.error_or_exception('Database error: %s', ex)
                 session.rollback()
         return df.metadata.get('webContentLink')
     else:
diff --git a/cps/helper.py b/cps/helper.py
index 4dabcfce..7dd3ca9f 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -435,8 +435,7 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
                         new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                         shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
                     except OSError as ex:
-                        log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
-                        log.debug(ex, exc_info=True)
+                        log.error_or_exception("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
                         return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                                  src=old_author_path, dest=new_author_path, error=str(ex))
     else:
@@ -550,8 +549,7 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
         # change location in database to new author/title path
         localbook.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
     except OSError as ex:
-        log.error("Rename title from: %s to %s: %s", path, new_path, ex)
-        log.debug(ex, exc_info=True)
+        log.error_or_exception("Rename title from: %s to %s: %s", path, new_path, ex)
         return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                  src=path, dest=new_path, error=str(ex))
     return False
@@ -572,8 +570,7 @@ def rename_files_on_change(first_author,
         if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
             shutil.rmtree(os.path.dirname(path))
     except (OSError, FileNotFoundError) as ex:
-        log.error("Error in rename file in path %s", ex)
-        log.debug(ex, exc_info=True)
+        log.error_or_exception("Error in rename file in path %s", ex)
         return _("Error in rename file in path: %(error)s", error=str(ex))
     return False
 

From 06e88456416fda3ccad0d36dd653d01f8486a207 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 20:31:25 +0100
Subject: [PATCH 157/220] Implement delete thumbnail entry Implement delete
 cache_dir on database change

---
 cps/admin.py           |  1 +
 cps/fs.py              |  1 -
 cps/helper.py          |  3 +++
 cps/tasks/thumbnail.py | 29 +++++++++++++++++++++++++----
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 5f9d0a0d..fea20ddc 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1248,6 +1248,7 @@ def _db_configuration_update_helper():
             ub.session.query(ub.KoboReadingState).delete()
             ub.session.query(ub.KoboStatistics).delete()
             ub.session.query(ub.KoboSyncedBooks).delete()
+            helper.delete_thumbnail_cache()
             ub.session_commit()
         _config_string(to_save, "config_calibre_dir")
         calibre_db.update_config(config)
diff --git a/cps/fs.py b/cps/fs.py
index 0171a5d5..2f83378d 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -16,7 +16,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import division, print_function, unicode_literals
 from . import logger
 from .constants import CACHE_DIR
 from os import makedirs, remove
diff --git a/cps/helper.py b/cps/helper.py
index 7d7a4ae9..c8db50c2 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -1074,3 +1074,6 @@ def get_download_link(book_id, book_format, client):
 
 def clear_cover_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
+
+def delete_thumbnail_cache():
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index c0887e0a..31dc1f7b 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -214,6 +214,9 @@ class TaskGenerateCoverThumbnails(CalibreTask):
     def name(self):
         return 'GenerateCoverThumbnails'
 
+    def __str__(self):
+        return "GenerateCoverThumbnails"
+
     @property
     def is_cancellable(self):
         return True
@@ -421,6 +424,9 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
     def name(self):
         return 'GenerateSeriesThumbnails'
 
+    def __str__(self):
+        return "GenerateSeriesThumbnails"
+
     @property
     def is_cancellable(self):
         return True
@@ -436,10 +442,12 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     def run(self, worker_thread):
         if self.app_db_session:
-            if self.book_id:
+            if self.book_id > 0:    # make sure all thumbnails aren't getting deleted due to a bug
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
                 for thumbnail in thumbnails:
                     self.delete_thumbnail(thumbnail)
+            else:
+                self.delete_all_thumbnails()
 
         self._handleSuccess()
         self.app_db_session.remove()
@@ -452,15 +460,28 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .all()
 
     def delete_thumbnail(self, thumbnail):
-        thumbnail.expiration = datetime.utcnow()
-
+        # thumbnail.expiration = datetime.utcnow()
         try:
-            self.app_db_session.commit()
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
+            self.app_db_session \
+                .query(ub.Thumbnail) \
+                .filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER) \
+                .filter(ub.Thumbnail.entity_id == thumbnail.entity_id) \
+                .delete()
+            self.app_db_session.commit()
         except Exception as ex:
             self.log.info(u'Error deleting book thumbnail: ' + str(ex))
             self._handleError(u'Error deleting book thumbnail: ' + str(ex))
 
+    def delete_all_thumbnails(self):
+        try:
+            self.app_db_session.query(ub.Thumbnail).filter(ub.Thumbnail.type == constants.THUMBNAIL_TYPE_COVER).delete()
+            self.app_db_session.commit()
+            self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
+        except Exception as ex:
+            self.log.info(u'Error deleting thumbnail directory: ' + str(ex))
+            self._handleError(u'Error deleting thumbnail directory: ' + str(ex))
+
     @property
     def name(self):
         return 'ThumbnailsClear'

From f34fc002da86114bcc9af379ec0b7dc115c1a133 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 16 Mar 2022 20:33:11 +0100
Subject: [PATCH 158/220] Implement missing cache delete Task identifier

---
 cps/tasks/thumbnail.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 31dc1f7b..00bd09ad 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -486,6 +486,9 @@ class TaskClearCoverThumbnailCache(CalibreTask):
     def name(self):
         return 'ThumbnailsClear'
 
+    def __str__(self):
+        return "Delete Thumbnail cache directory"
+
     @property
     def is_cancellable(self):
         return False

From 39459603d4220deeffa10549bb0e7315bb3e45f9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 19 Mar 2022 18:01:51 +0100
Subject: [PATCH 159/220] Update SECURITY.md

---
 SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SECURITY.md b/SECURITY.md
index 26ce3c55..54be54bd 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -36,6 +36,6 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
 
 
-## Staement regarding Log4j (CVE-2021-44228 and related)
+## Statement regarding Log4j (CVE-2021-44228 and related)
 
 Calibre-web is not affected by bugs related to Log4j. Calibre-Web is a python program, therefore not using Java, and not using the Java logging feature log4j. 

From 8cb5989c97b2adeb15f11f38b8e2dec3efcbaf5a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 20 Mar 2022 11:21:15 +0100
Subject: [PATCH 160/220] Catch additional error on not existing custom column
 linked to read column (#2341) Prevent metadata changes are lost on edit books
 with errors (#2326) Better log output Renamed log message on database delete

---
 cps/admin.py                            |   2 +-
 cps/db.py                               |  18 +-
 cps/editbooks.py                        | 306 +++++++++++++-----------
 cps/helper.py                           |  56 ++---
 cps/render_template.py                  |   4 +-
 cps/templates/detail.html               |   2 +-
 cps/ub.py                               |  14 +-
 cps/web.py                              |  20 +-
 optional-requirements.txt               |   4 +-
 test/Calibre-Web TestSummary_Linux.html | 127 +++++++---
 10 files changed, 312 insertions(+), 241 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 0b90327e..447e0227 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1237,7 +1237,7 @@ def _db_configuration_update_helper():
         config.store_calibre_uuid(calibre_db, db.LibraryId)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
-            log.info("Calibre Database changed, delete all Calibre-Web info related to old Database")
+            log.info("Calibre Database changed, all Calibre-Web info related to old Database gets deleted")
             ub.session.query(ub.Downloads).delete()
             ub.session.query(ub.ArchivedBook).delete()
             ub.session.query(ub.ReadBook).delete()
diff --git a/cps/db.py b/cps/db.py
index b910363b..f2fe9b78 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -620,8 +620,8 @@ class CalibreDB:
                 bd = (self.session.query(Books, read_column.value, ub.ArchivedBook.is_archived).select_from(Books)
                       .join(read_column, read_column.book == book_id,
                       isouter=True))
-            except (KeyError, AttributeError):
-                log.error("Custom Column No.%d is not existing in calibre database", read_column)
+            except (KeyError, AttributeError, IndexError):
+                log.error("Custom Column No.{} is not existing in calibre database".format(read_column))
                 # Skip linking read column and return None instead of read status
                 bd = self.session.query(Books, None, ub.ArchivedBook.is_archived)
         return (bd.filter(Books.id == book_id)
@@ -665,11 +665,11 @@ class CalibreDB:
                 neg_content_cc_filter = false() if neg_cc_list == [''] else \
                     getattr(Books, 'custom_column_' + str(self.config.config_restricted_column)). \
                     any(cc_classes[self.config.config_restricted_column].value.in_(neg_cc_list))
-            except (KeyError, AttributeError):
+            except (KeyError, AttributeError, IndexError):
                 pos_content_cc_filter = false()
                 neg_content_cc_filter = true()
-                log.error(u"Custom Column No.%d is not existing in calibre database",
-                          self.config.config_restricted_column)
+                log.error("Custom Column No.{} is not existing in calibre database".format(
+                    self.config.config_restricted_column))
                 flash(_("Custom Column No.%(column)d is not existing in calibre database",
                         column=self.config.config_restricted_column),
                       category="error")
@@ -727,8 +727,8 @@ class CalibreDB:
                     query = (self.session.query(database, read_column.value, ub.ArchivedBook.is_archived)
                              .select_from(Books)
                              .outerjoin(read_column, read_column.book == Books.id))
-                except (KeyError, AttributeError):
-                    log.error("Custom Column No.%d is not existing in calibre database", read_column)
+                except (KeyError, AttributeError, IndexError):
+                    log.error("Custom Column No.{} is not existing in calibre database".format(read_column))
                     # Skip linking read column and return None instead of read status
                     query = self.session.query(database, None, ub.ArchivedBook.is_archived)
             query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
@@ -839,8 +839,8 @@ class CalibreDB:
                 read_column = cc_classes[config_read_column]
                 query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value).select_from(Books)
                          .outerjoin(read_column, read_column.book == Books.id))
-            except (KeyError, AttributeError):
-                log.error("Custom Column No.%d is not existing in calibre database", config_read_column)
+            except (KeyError, AttributeError, IndexError):
+                log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
                 # Skip linking read column
                 query = self.session.query(Books, ub.ArchivedBook.is_archived, None)
         query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 728164f9..c07e5d24 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -289,13 +289,13 @@ def delete_whole_book(book_id, book):
 def render_delete_book_result(book_format, json_response, warning, book_id):
     if book_format:
         if json_response:
-            return json.dumps([warning, {"location": url_for("edit-book.edit_book", book_id=book_id),
+            return json.dumps([warning, {"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                          "type": "success",
                                          "format": book_format,
                                          "message": _('Book Format Successfully Deleted')}])
         else:
             flash(_('Book Format Successfully Deleted'), category="success")
-            return redirect(url_for('edit-book.edit_book', book_id=book_id))
+            return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
     else:
         if json_response:
             return json.dumps([warning, {"location": url_for('web.index'),
@@ -316,16 +316,16 @@ def delete_book_from_table(book_id, book_format, json_response):
                 result, error = helper.delete_book(book, config.config_calibre_dir, book_format=book_format.upper())
                 if not result:
                     if json_response:
-                        return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
+                        return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                             "type": "danger",
                                             "format": "",
                                             "message": error}])
                     else:
                         flash(error, category="error")
-                        return redirect(url_for('edit-book.edit_book', book_id=book_id))
+                        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
                 if error:
                     if json_response:
-                        warning = {"location": url_for("edit-book.edit_book", book_id=book_id),
+                        warning = {"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                    "type": "warning",
                                    "format": "",
                                    "message": error}
@@ -343,13 +343,13 @@ def delete_book_from_table(book_id, book_format, json_response):
                 log.error_or_exception(ex)
                 calibre_db.session.rollback()
                 if json_response:
-                    return json.dumps([{"location": url_for("edit-book.edit_book", book_id=book_id),
+                    return json.dumps([{"location": url_for("edit-book.show_edit_book", book_id=book_id),
                                         "type": "danger",
                                         "format": "",
                                         "message": ex}])
                 else:
                     flash(str(ex), category="error")
-                    return redirect(url_for('edit-book.edit_book', book_id=book_id))
+                    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
         else:
             # book not found
@@ -357,13 +357,13 @@ def delete_book_from_table(book_id, book_format, json_response):
         return render_delete_book_result(book_format, json_response, warning, book_id)
     message = _("You are missing permissions to delete books")
     if json_response:
-        return json.dumps({"location": url_for("edit-book.edit_book", book_id=book_id),
+        return json.dumps({"location": url_for("edit-book.show_edit_book", book_id=book_id),
                            "type": "danger",
                            "format": "",
                            "message": message})
     else:
         flash(message, category="error")
-        return redirect(url_for('edit-book.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
 
 def render_edit_book(book_id):
@@ -413,18 +413,18 @@ def render_edit_book(book_id):
 
 def edit_book_ratings(to_save, book):
     changed = False
-    if to_save["rating"].strip():
+    if to_save.get("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:
+        rating_x2 = int(float(to_save.get("rating","")) * 2)
+        if rating_x2 != old_rating:
             changed = True
-            is_rating = calibre_db.session.query(db.Ratings).filter(db.Ratings.rating == ratingx2).first()
+            is_rating = calibre_db.session.query(db.Ratings).filter(db.Ratings.rating == rating_x2).first()
             if is_rating:
                 book.ratings.append(is_rating)
             else:
-                new_rating = db.Ratings(rating=ratingx2)
+                new_rating = db.Ratings(rating=rating_x2)
                 book.ratings.append(new_rating)
             if old_rating:
                 book.ratings.remove(book.ratings[0])
@@ -622,24 +622,26 @@ def edit_cc_data(book_id, book, to_save, cc):
                                               'custom')
     return changed
 
-
+# returns None if no file is uploaded
+# returns False if an error occours, in all other cases the ebook metadata is returned
 def upload_single_file(file_request, book, book_id):
     # Check and handle Uploaded file
-    if 'btn-upload-format' in file_request.files:
-        requested_file = file_request.files['btn-upload-format']
+    requested_file = file_request.files.get('btn-upload-format', None)
+    if requested_file:
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
-                abort(403)
+                flash(_(u"User has no rights to upload additional file formats"), category="error")
+                return False
             if '.' in requested_file.filename:
                 file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
                 if file_ext not in constants.EXTENSIONS_UPLOAD and '' not in constants.EXTENSIONS_UPLOAD:
                     flash(_("File extension '%(ext)s' is not allowed to be uploaded to this server", ext=file_ext),
                           category="error")
-                    return redirect(url_for('web.show_book', book_id=book.id))
+                    return False
             else:
                 flash(_('File to be uploaded must have an extension'), category="error")
-                return redirect(url_for('web.show_book', book_id=book.id))
+                return False
 
             file_name = book.path.rsplit('/', 1)[-1]
             filepath = os.path.normpath(os.path.join(config.config_calibre_dir, book.path))
@@ -651,12 +653,12 @@ def upload_single_file(file_request, book, book_id):
                     os.makedirs(filepath)
                 except OSError:
                     flash(_(u"Failed to create path %(path)s (Permission denied).", path=filepath), category="error")
-                    return redirect(url_for('web.show_book', book_id=book.id))
+                    return False
             try:
                 requested_file.save(saved_filename)
             except OSError:
                 flash(_(u"Failed to store file %(file)s.", file=saved_filename), category="error")
-                return redirect(url_for('web.show_book', book_id=book.id))
+                return False
 
             file_size = os.path.getsize(saved_filename)
             is_format = calibre_db.get_book_format(book_id, file_ext.upper())
@@ -674,7 +676,7 @@ def upload_single_file(file_request, book, book_id):
                     calibre_db.session.rollback()
                     log.error_or_exception("Database error: {}".format(e))
                     flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-                    return redirect(url_for('web.show_book', book_id=book.id))
+                    return False # return redirect(url_for('web.show_book', book_id=book.id))
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
@@ -684,15 +686,16 @@ def upload_single_file(file_request, book, book_id):
             return uploader.process(
                 saved_filename, *os.path.splitext(requested_file.filename),
                 rarExecutable=config.config_rarfile_location)
-
+    return None
 
 def upload_cover(cover_request, book):
-    if 'btn-upload-cover' in cover_request.files:
-        requested_file = cover_request.files['btn-upload-cover']
+    requested_file = cover_request.files.get('btn-upload-cover', None)
+    if requested_file:
         # check for empty request
         if requested_file.filename != '':
             if not current_user.role_upload():
-                abort(403)
+                flash(_(u"User has no rights to upload cover"), category="error")
+                return False
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
                 return True
@@ -716,25 +719,6 @@ def handle_title_on_edit(book, book_title):
 def handle_author_on_edit(book, author_name, update_stored=True):
     # handle author(s)
     input_authors, renamed = prepare_authors(author_name)
-    '''input_authors = author_name.split('&')
-    input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
-    # Remove duplicates in authors list
-    input_authors = helper.uniq(input_authors)
-    # we have all author names now
-    if input_authors == ['']:
-        input_authors = [_(u'Unknown')]  # prevent empty Author
-
-    renamed = list()
-    for in_aut in input_authors:
-        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
-        if renamed_author and in_aut != renamed_author.name:
-            renamed.append(renamed_author.name)
-            all_books = calibre_db.session.query(db.Books) \
-                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
-            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
-            sorted_old_author = helper.get_sorted_author(in_aut)
-            for one_book in all_books:
-                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)'''
 
     change = modify_database_object(input_authors, book.authors, db.Authors, calibre_db.session, 'author')
 
@@ -754,12 +738,19 @@ def handle_author_on_edit(book, author_name, update_stored=True):
         change = True
     return input_authors, change, renamed
 
+@EditBook.route("/admin/book/<int:book_id>", methods=['GET'])
+@login_required_if_no_ano
+@edit_required
+def show_edit_book(book_id):
+    return render_edit_book(book_id)
 
-@EditBook.route("/admin/book/<int:book_id>", methods=['GET', 'POST'])
+
+@EditBook.route("/admin/book/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
     modify_date = False
+    edit_error = False
 
     # create the function for sorting...
     try:
@@ -768,109 +759,120 @@ def edit_book(book_id):
         log.error_or_exception(e)
         calibre_db.session.rollback()
 
-    # Show form
-    if request.method != 'POST':
-        return render_edit_book(book_id)
-
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-
     # Book not found
     if not book:
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
               category="error")
         return redirect(url_for("web.index"))
 
-    meta = upload_single_file(request, book, book_id)
-    if upload_cover(request, book) is True:
-        book.has_cover = 1
-        modify_date = True
+    to_save = request.form.to_dict()
+
     try:
-        to_save = request.form.to_dict()
-        merge_metadata(to_save, meta)
-        # Update book
+        # Update folder of book on local disk
         edited_books_id = None
-
-        # handle book title
+        title_author_error = None
+        # handle book title change
         title_change = handle_title_on_edit(book, to_save["book_title"])
-
-        input_authors, authorchange, renamed = handle_author_on_edit(book, to_save["author_name"])
-        if authorchange or title_change:
+        # handle book author change
+        input_authors, author_change, renamed = handle_author_on_edit(book, to_save["author_name"])
+        if author_change or title_change:
             edited_books_id = book.id
             modify_date = True
+            title_author_error = helper.update_dir_structure(edited_books_id,
+                                                             config.config_calibre_dir,
+                                                             input_authors[0],
+                                                             renamed_author=renamed)
+        if title_author_error:
+            flash(title_author_error, category="error")
+            calibre_db.session.rollback()
+            book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
 
+        # handle upload other formats from local disk
+        meta = upload_single_file(request, book, book_id)
+        # only merge metadata if file was uploaded and no error occurred (meta equals not false or none)
+        if meta:
+            merge_metadata(to_save, meta)
+        # handle upload covers from local disk
+        cover_upload_success = upload_cover(request, book)
+        if cover_upload_success:
+            book.has_cover = 1
+            modify_date = True
+
+        # upload new covers or new file formats to google drive
         if config.config_use_google_drive:
             gdriveutils.updateGdriveCalibreFromLocal()
 
-        error = ""
-        if edited_books_id:
-            error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                                renamed_author=renamed)
+        if to_save.get("cover_url", None):
+            if not current_user.role_upload():
+                edit_error = True
+                flash(_(u"User has no rights to upload cover"), category="error")
+            if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
+                book.has_cover = 0
+            else:
+                result, error = helper.save_cover_from_url(to_save["cover_url"], book.path)
+                if result is True:
+                    book.has_cover = 1
+                    modify_date = True
+                else:
+                    flash(error, category="error")
 
-        if not error:
-            if "cover_url" in to_save:
-                if to_save["cover_url"]:
-                    if not current_user.role_upload():
-                        calibre_db.session.rollback()
-                        return "", 403
-                    if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
-                        book.has_cover = 0
-                    else:
-                        result, error = helper.save_cover_from_url(to_save["cover_url"], book.path)
-                        if result is True:
-                            book.has_cover = 1
-                            modify_date = True
-                        else:
-                            flash(error, category="error")
-
-            # Add default series_index to book
-            modify_date |= edit_book_series_index(to_save["series_index"], book)
-            # Handle book comments/description
-            modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
-            # Handle identifiers
-            input_identifiers = identifier_list(to_save, book)
-            modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
-            if warning:
-                flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-            modify_date |= modification
-            # Handle book tags
-            modify_date |= edit_book_tags(to_save['tags'], book)
-            # Handle book series
-            modify_date |= edit_book_series(to_save["series"], book)
-            # handle book publisher
-            modify_date |= edit_book_publisher(to_save['publisher'], book)
-            # handle book languages
+        # Add default series_index to book
+        modify_date |= edit_book_series_index(to_save["series_index"], book)
+        # Handle book comments/description
+        modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
+        # Handle identifiers
+        input_identifiers = identifier_list(to_save, book)
+        modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
+        if warning:
+            flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+        modify_date |= modification
+        # Handle book tags
+        modify_date |= edit_book_tags(to_save['tags'], book)
+        # Handle book series
+        modify_date |= edit_book_series(to_save["series"], book)
+        # handle book publisher
+        modify_date |= edit_book_publisher(to_save['publisher'], book)
+        # handle book languages
+        try:
             modify_date |= edit_book_languages(to_save['languages'], book)
-            # handle book ratings
-            modify_date |= edit_book_ratings(to_save, book)
-            # handle cc data
-            modify_date |= edit_all_cc_data(book_id, book, to_save)
+        except ValueError as e:
+            flash(str(e), category="error")
+            edit_error = True
+        # handle book ratings
+        modify_date |= edit_book_ratings(to_save, book)
+        # handle cc data
+        modify_date |= edit_all_cc_data(book_id, book, to_save)
 
-            if to_save["pubdate"]:
-                try:
-                    book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
-                except ValueError:
-                    book.pubdate = db.Books.DEFAULT_PUBDATE
-            else:
+        if to_save.get("pubdate", None):
+            try:
+                book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
+            except ValueError as e:
                 book.pubdate = db.Books.DEFAULT_PUBDATE
-
-            if modify_date:
-                book.last_modified = datetime.utcnow()
-                kobo_sync_status.remove_synced_book(edited_books_id, all=True)
-
-            calibre_db.session.merge(book)
-            calibre_db.session.commit()
-            if config.config_use_google_drive:
-                gdriveutils.updateGdriveCalibreFromLocal()
-            if "detail_view" in to_save:
-                return redirect(url_for('web.show_book', book_id=book.id))
-            else:
-                flash(_("Metadata successfully updated"), category="success")
-                return render_edit_book(book_id)
+                flash(str(e), category="error")
+                edit_error = True
+        else:
+            book.pubdate = db.Books.DEFAULT_PUBDATE
+
+        if modify_date:
+            book.last_modified = datetime.utcnow()
+            kobo_sync_status.remove_synced_book(edited_books_id, all=True)
+
+        calibre_db.session.merge(book)
+        calibre_db.session.commit()
+        if config.config_use_google_drive:
+            gdriveutils.updateGdriveCalibreFromLocal()
+        if meta is not False \
+            and edit_error is not True \
+                and title_author_error is not True \
+                and cover_upload_success is not False:
+            flash(_("Metadata successfully updated"), category="success")
+        if "detail_view" in to_save:
+            return redirect(url_for('web.show_book', book_id=book.id))
         else:
-            calibre_db.session.rollback()
-            flash(error, category="error")
             return render_edit_book(book_id)
     except ValueError as e:
+        log.error_or_exception("Error: {}".format(e))
         calibre_db.session.rollback()
         flash(str(e), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
@@ -882,14 +884,14 @@ def edit_book(book_id):
     except Exception as ex:
         log.error_or_exception(ex)
         calibre_db.session.rollback()
-        flash(_("Error editing book, please check logfile for details"), category="error")
+        flash(_("Error editing book: {}".format(ex)), category="error")
         return redirect(url_for('web.show_book', book_id=book.id))
 
 
 def merge_metadata(to_save, meta):
-    if to_save['author_name'] == _(u'Unknown'):
+    if to_save.get('author_name', "") == _(u'Unknown'):
         to_save['author_name'] = ''
-    if to_save['book_title'] == _(u'Unknown'):
+    if to_save.get('book_title', "") == _(u'Unknown'):
         to_save['book_title'] = ''
     for s_field, m_field in [
             ('tags', 'tags'), ('author_name', 'author'), ('series', 'series'),
@@ -1117,7 +1119,7 @@ def upload():
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
-                        resp = {"location": url_for('edit-book.edit_book', book_id=book_id)}
+                        resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
                         return Response(json.dumps(resp), mimetype='application/json')
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
@@ -1139,7 +1141,7 @@ def convert_bookformat(book_id):
 
     if (book_format_from is None) or (book_format_to is None):
         flash(_(u"Source or destination format for conversion missing"), category="error")
-        return redirect(url_for('edit-book.edit_book', book_id=book_id))
+        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
     log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
     rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
@@ -1151,7 +1153,7 @@ def convert_bookformat(book_id):
               category="success")
     else:
         flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
-    return redirect(url_for('edit-book.edit_book', book_id=book_id))
+    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
 
 @EditBook.route("/ajax/getcustomenum/<int:c_id>")
@@ -1211,10 +1213,15 @@ def edit_list_book(param):
                            mimetype='application/json')
         elif param == 'title':
             sort_param = book.sort
-            handle_title_on_edit(book, vals.get('value', ""))
-            helper.update_dir_structure(book.id, config.config_calibre_dir)
-            ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
-                           mimetype='application/json')
+            if handle_title_on_edit(book, vals.get('value', "")):
+                rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir)
+                if not rename_error:
+                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+                                   mimetype='application/json')
+                else:
+                    ret = Response(json.dumps({'success': False,
+                                               'msg': rename_error}),
+                                   mimetype='application/json')
         elif param == 'sort':
             book.sort = vals['value']
             ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
@@ -1225,11 +1232,17 @@ def edit_list_book(param):
                            mimetype='application/json')
         elif param == 'authors':
             input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
-            helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0], renamed_author=renamed)
-            ret = Response(json.dumps({
-                'success': True,
-                'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
-                mimetype='application/json')
+            rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0],
+                                                       renamed_author=renamed)
+            if not rename_error:
+                ret = Response(json.dumps({
+                    'success': True,
+                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+                    mimetype='application/json')
+            else:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': rename_error}),
+                               mimetype='application/json')
         elif param == 'is_archived':
             is_archived = change_archived_books(book.id, vals['value'] == "True",
                                                 message="Book {} archive bit set to: {}".format(book.id, vals['value']))
@@ -1356,8 +1369,8 @@ def table_xchange_author_title():
                 author_names.append(authr.name.replace('|', ','))
 
             title_change = handle_title_on_edit(book, " ".join(author_names))
-            input_authors, authorchange, renamed = handle_author_on_edit(book, authors)
-            if authorchange or title_change:
+            input_authors, author_change, renamed = handle_author_on_edit(book, authors)
+            if author_change or title_change:
                 edited_books_id = book.id
                 modify_date = True
 
@@ -1365,8 +1378,9 @@ def table_xchange_author_title():
                 gdriveutils.updateGdriveCalibreFromLocal()
 
             if edited_books_id:
-                helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                            renamed_author=renamed)
+                # toDo: Handle error
+                edit_error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
+                                                         renamed_author=renamed)
             if modify_date:
                 book.last_modified = datetime.utcnow()
             try:
diff --git a/cps/helper.py b/cps/helper.py
index 7dd3ca9f..3a2276e9 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -327,8 +327,9 @@ def edit_book_read_status(book_id, read_status=None):
                 new_cc = cc_class(value=read_status or 1, book=book_id)
                 calibre_db.session.add(new_cc)
                 calibre_db.session.commit()
-        except (KeyError, AttributeError):
-            log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+        except (KeyError, AttributeError, IndexError):
+            log.error(
+                "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             return "Custom Column No.{} is not existing in calibre database".format(config.config_read_column)
         except (OperationalError, InvalidRequestError) as ex:
             calibre_db.session.rollback()
@@ -435,7 +436,8 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
                         new_author_path = os.path.join(calibre_path, new_author_rename_dir)
                         shutil.move(os.path.normcase(old_author_path), os.path.normcase(new_author_path))
                     except OSError as ex:
-                        log.error_or_exception("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
+                        log.error("Rename author from: %s to %s: %s", old_author_path, new_author_path, ex)
+                        log.debug(ex, exc_info=True)
                         return _("Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                                  src=old_author_path, dest=new_author_path, error=str(ex))
     else:
@@ -446,31 +448,31 @@ def rename_all_authors(first_author, renamed_author, calibre_path="", localbook=
 # Moves files in file storage during author/title rename, or from temp dir to file storage
 def update_dir_structure_file(book_id, calibre_path, first_author, original_filepath, db_filename, renamed_author):
     # get book database entry from id, if original path overwrite source with original_filepath
-    localbook = calibre_db.get_book(book_id)
+    local_book = calibre_db.get_book(book_id)
     if original_filepath:
         path = original_filepath
     else:
-        path = os.path.join(calibre_path, localbook.path)
+        path = os.path.join(calibre_path, local_book.path)
 
-    # Create (current) authordir and titledir from database
-    authordir = localbook.path.split('/')[0]
-    titledir = localbook.path.split('/')[1]
+    # Create (current) author_dir and title_dir from database
+    author_dir = local_book.path.split('/')[0]
+    title_dir = local_book.path.split('/')[1]
 
-    # Create new_authordir from parameter or from database
-    # Create new titledir from database and add id
-    new_authordir = rename_all_authors(first_author, renamed_author, calibre_path, localbook)
+    # Create new_author_dir from parameter or from database
+    # Create new title_dir from database and add id
+    new_author_dir = rename_all_authors(first_author, renamed_author, calibre_path, local_book)
     if first_author:
         if first_author.lower() in [r.lower() for r in renamed_author]:
-            if os.path.isdir(os.path.join(calibre_path, new_authordir)):
-                path = os.path.join(calibre_path, new_authordir, titledir)
+            if os.path.isdir(os.path.join(calibre_path, new_author_dir)):
+                path = os.path.join(calibre_path, new_author_dir, title_dir)
 
-    new_titledir = get_valid_filename(localbook.title, chars=96) + " (" + str(book_id) + ")"
+    new_title_dir = get_valid_filename(local_book.title, chars=96) + " (" + str(book_id) + ")"
 
-    if titledir != new_titledir or authordir != new_authordir or original_filepath:
+    if title_dir != new_title_dir or author_dir != new_author_dir or original_filepath:
         error = move_files_on_change(calibre_path,
-                                     new_authordir,
-                                     new_titledir,
-                                     localbook,
+                                     new_author_dir,
+                                     new_title_dir,
+                                     local_book,
                                      db_filename,
                                      original_filepath,
                                      path)
@@ -478,7 +480,7 @@ def update_dir_structure_file(book_id, calibre_path, first_author, original_file
             return error
 
     # Rename all files from old names to new names
-    return rename_files_on_change(first_author, renamed_author, localbook, original_filepath, path, calibre_path)
+    return rename_files_on_change(first_author, renamed_author, local_book, original_filepath, path, calibre_path)
 
 
 def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_dir, original_filepath, filename_ext):
@@ -490,7 +492,7 @@ def upload_new_file_gdrive(book_id, first_author, renamed_author, title, title_d
                                title_dir + " (" + str(book_id) + ")")
     book.path = gdrive_path.replace("\\", "/")
     gd.uploadFileToEbooksFolder(os.path.join(gdrive_path, file_name).replace("\\", "/"), original_filepath)
-    return rename_files_on_change(first_author, renamed_author, localbook=book, gdrive=True)
+    return rename_files_on_change(first_author, renamed_author, local_book=book, gdrive=True)
 
 
 def update_dir_structure_gdrive(book_id, first_author, renamed_author):
@@ -549,7 +551,7 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
         # change location in database to new author/title path
         localbook.path = os.path.join(new_authordir, new_titledir).replace('\\', '/')
     except OSError as ex:
-        log.error_or_exception("Rename title from: %s to %s: %s", path, new_path, ex)
+        log.error_or_exception("Rename title from {} to {} failed with error: {}".format(path, new_path, ex))
         return _("Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s",
                  src=path, dest=new_path, error=str(ex))
     return False
@@ -557,8 +559,8 @@ def move_files_on_change(calibre_path, new_authordir, new_titledir, localbook, d
 
 def rename_files_on_change(first_author,
                            renamed_author,
-                           localbook,
-                           orignal_filepath="",
+                           local_book,
+                           original_filepath="",
                            path="",
                            calibre_path="",
                            gdrive=False):
@@ -566,12 +568,12 @@ def rename_files_on_change(first_author,
     try:
         clean_author_database(renamed_author, calibre_path, gdrive=gdrive)
         if first_author and first_author not in renamed_author:
-            clean_author_database([first_author], calibre_path, localbook, gdrive)
-        if not gdrive and not renamed_author and not orignal_filepath and len(os.listdir(os.path.dirname(path))) == 0:
+            clean_author_database([first_author], calibre_path, local_book, gdrive)
+        if not gdrive and not renamed_author and not original_filepath and len(os.listdir(os.path.dirname(path))) == 0:
             shutil.rmtree(os.path.dirname(path))
     except (OSError, FileNotFoundError) as ex:
-        log.error_or_exception("Error in rename file in path %s", ex)
-        return _("Error in rename file in path: %(error)s", error=str(ex))
+        log.error_or_exception("Error in rename file in path {}".format(ex))
+        return _("Error in rename file in path: {}".format(str(ex)))
     return False
 
 
diff --git a/cps/render_template.py b/cps/render_template.py
index 7cd341ea..09a32497 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -110,8 +110,8 @@ def get_readbooks_ids():
             readBooks = calibre_db.session.query(db.cc_classes[config.config_read_column])\
                 .filter(db.cc_classes[config.config_read_column].value == True).all()
             return frozenset([x.book for x in readBooks])
-        except (KeyError, AttributeError):
-            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+        except (KeyError, AttributeError, IndexError):
+            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             return []
 
 # Returns the template for rendering and includes the instance name
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 38005cb9..3ced5854 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -295,7 +295,7 @@
       {% if g.user.role_edit() %}
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group" aria-label="Edit/Delete book">
-          <a href="{{ url_for('edit-book.edit_book', book_id=entry.id) }}" class="btn btn-sm btn-primary" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
+          <a href="{{ url_for('edit-book.show_edit_book', book_id=entry.id) }}" class="btn btn-sm btn-primary" id="edit_book" role="button"><span class="glyphicon glyphicon-edit"></span> {{_('Edit Metadata')}}</a>
         </div>
       </div>
       {% endif %}
diff --git a/cps/ub.py b/cps/ub.py
index a2be004c..4bb66ff6 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -67,6 +67,7 @@ logged_in = dict()
 def signal_store_user_session(object, user):
     store_user_session()
 
+
 def store_user_session():
     if flask_session.get('user_id', ""):
         flask_session['_user_id'] = flask_session.get('user_id', "")
@@ -85,15 +86,16 @@ def store_user_session():
     else:
         log.error("No user id in session")
 
+
 def delete_user_session(user_id, session_key):
     try:
         log.debug("Deleted session_key: " + session_key)
-        session.query(User_Sessions).filter(User_Sessions.user_id==user_id,
-                                            User_Sessions.session_key==session_key).delete()
+        session.query(User_Sessions).filter(User_Sessions.user_id == user_id,
+                                            User_Sessions.session_key == session_key).delete()
         session.commit()
-    except (exc.OperationalError, exc.InvalidRequestError) as e:
+    except (exc.OperationalError, exc.InvalidRequestError) as ex:
         session.rollback()
-        log.exception(e)
+        log.exception(ex)
 
 
 def check_user_session(user_id, session_key):
@@ -209,9 +211,9 @@ class UserBase:
             pass
         try:
             session.commit()
-        except (exc.OperationalError, exc.InvalidRequestError):
+        except (exc.OperationalError, exc.InvalidRequestError) as e:
             session.rollback()
-            # ToDo: Error message
+            log.error_or_exception(e)
 
     def __repr__(self):
         return '<User %r>' % self.name
diff --git a/cps/web.py b/cps/web.py
index b1f27035..d21ba630 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -87,7 +87,7 @@ def add_security_headers(resp):
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
     csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
     resp.headers['Content-Security-Policy'] = csp
-    if request.endpoint == "edit-book.edit_book" or config.config_use_google_drive:
+    if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
     elif request.endpoint == "web.read_book":
         resp.headers['Content-Security-Policy'] += " blob:;style-src-elem 'self' blob: 'unsafe-inline';"
@@ -646,8 +646,8 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                                                                     db.Books.id == db.books_series_link.c.book,
                                                                     db.Series,
                                                                     db.cc_classes[config.config_read_column])
-        except (KeyError, AttributeError):
-            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+        except (KeyError, AttributeError, IndexError):
+            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             if not as_xml:
                 flash(_("Custom Column No.%(column)d is not existing in calibre database",
                         column=config.config_read_column),
@@ -826,8 +826,9 @@ def list_books():
                     books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
                              .select_from(db.Books)
                              .outerjoin(read_column, read_column.book == db.Books.id))
-                except (KeyError, AttributeError):
-                    log.error("Custom Column No.%d is not existing in calibre database", read_column)
+                except (KeyError, AttributeError, IndexError):
+                    log.error(
+                        "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
                     # Skip linking read column and return None instead of read status
                     books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
             books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
@@ -1139,8 +1140,9 @@ def adv_search_read_status(q, read_status):
                 else:
                     q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
                         .filter(coalesce(db.cc_classes[config.config_read_column].value, False) != True)
-            except (KeyError, AttributeError):
-                log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            except (KeyError, AttributeError, IndexError):
+                log.error(
+                    "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
                 flash(_("Custom Column No.%(column)d is not existing in calibre database",
                         column=config.config_read_column),
                       category="error")
@@ -1262,8 +1264,8 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
                      .select_from(db.Books)
                      .outerjoin(read_column, read_column.book == db.Books.id))
-        except (KeyError, AttributeError):
-            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+        except (KeyError, AttributeError, IndexError):
+            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             # Skip linking read column
             query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
     query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
diff --git a/optional-requirements.txt b/optional-requirements.txt
index aea1efb7..e54b0829 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.41.0
+google-api-python-client>=1.7.11,<2.42.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.41.0
+google-api-python-client>=1.7.11,<2.42.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index e3b7a3d7..7be8da35 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-03-14 21:13:33</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-19 22:04:05</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>2022-03-15 02:05:20</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-20 02:50:09</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>4h 3 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>3h 58 min</p>
         </div>
       </div>
       </div>
@@ -1589,8 +1589,8 @@
     <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">17</td>
-        <td class="text-center">3</td>
+        <td class="text-center">16</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1735,11 +1735,31 @@
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id="ft16.16" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</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_ft16.16')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 145, in test_edit_title
+    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1761,7 +1781,7 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 853, in test_upload_book_epub
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 855, in test_upload_book_epub
     self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
 AssertionError: &#39;8936&#39; != &#39;1103&#39;
 - 8936
@@ -1801,7 +1821,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 766, in test_upload_cover_hdd
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 768, in test_upload_cover_hdd
     self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
 AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
@@ -1830,9 +1850,9 @@ AssertionError: 0.0 not greater than 0.02</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 935, in test_watch_metadata
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 937, in test_watch_metadata
     self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=2e081d1c-86d2-461f-a309-e51e1e378161&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=34e51cc2-2413-4a23-8324-26d568a421ba&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2825,34 +2845,65 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestMergeBooksList</td>
-        <td class="text-center">2</td>
-        <td class="text-center">2</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id="et31.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
+                <div class='testcase'>setUpClass (test_merge_books_list)</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt31.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et31.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 24, in setUpClass
+    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 175, in startup
+    inst.driver = webdriver.Firefox()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/firefox/webdriver.py&#34;, line 178, in __init__
+    RemoteWebDriver.__init__(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 269, in __init__
+    self.start_session(capabilities, browser_profile)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in start_session
+    response = self.execute(Command.NEW_SESSION, parameters)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.WebDriverException: Message: Process unexpectedly closed with status 0
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 28, in setUpClass
+    cls.driver.quit()
+AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -4600,10 +4651,10 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>405</td>
-        <td>396</td>
-        <td>3</td>
-        <td>0</td>
+        <td>404</td>
+        <td>393</td>
+        <td>4</td>
+        <td>1</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4776,7 +4827,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4806,7 +4857,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4836,7 +4887,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4878,7 +4929,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4914,7 +4965,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4956,7 +5007,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.40.0</td>
+              <td>2.41.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5046,7 +5097,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
 </div>
 
 <script>
-    drawCircle(396, 3, 0, 6);
+    drawCircle(393, 4, 1, 6);
     showCase(5);
 </script>
 

From c0d066098637e0724c42f28e956dc767e1900d62 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 20 Mar 2022 19:13:07 +0100
Subject: [PATCH 161/220] Added names for jobs to make log more readable Bugfix
 logging delete thumbnail

---
 cps/schedule.py                      |  8 ++++----
 cps/services/background_scheduler.py | 16 ++++++++--------
 cps/tasks/thumbnail.py               |  5 ++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 5b97cecb..79e0006c 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -30,15 +30,15 @@ def get_scheduled_tasks(reconnect=True):
 
     # Reconnect Calibre database (metadata.db)
     if reconnect:
-        tasks.append(lambda: TaskReconnectDatabase())
+        tasks.append([lambda: TaskReconnectDatabase(), 'reconnect'])
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
-        tasks.append(lambda: TaskGenerateCoverThumbnails())
+        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers'])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
-        tasks.append(lambda: TaskGenerateSeriesThumbnails())
+        tasks.append([lambda: TaskGenerateSeriesThumbnails(), 'generate book covers'])
 
     return tasks
 
@@ -63,7 +63,7 @@ def register_scheduled_tasks():
         # Register scheduled tasks
         if start != end:
             scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
-            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', hour=end)
+            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end)
 
         # Kick-off tasks, if they should currently be running
         if should_task_be_running(start, end):
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index 415b2962..eee5b7cd 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -47,37 +47,37 @@ class BackgroundScheduler:
 
         return cls._instance
 
-    def schedule(self, func, trigger, **trigger_args):
+    def schedule(self, func, trigger, name=None, **trigger_args):
         if use_APScheduler:
-            return self.scheduler.add_job(func=func, trigger=trigger, **trigger_args)
+            return self.scheduler.add_job(func=func, trigger=trigger, name=name, **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task(self, task, user=None, trigger='cron', **trigger_args):
+    def schedule_task(self, task, user=None, name=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
                 worker_task.scheduled = True
                 WorkerThread.add(user, worker_task)
-            return self.schedule(func=scheduled_task, trigger=trigger, **trigger_args)
+            return self.schedule(func=scheduled_task, trigger=trigger, name=name, **trigger_args)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks(self, tasks, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task(task, user=user, trigger=trigger, **trigger_args)
+                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task_immediately(self, task, user=None):
+    def schedule_task_immediately(self, task, user=None, name=None):
         if use_APScheduler:
             def immediate_task():
                 WorkerThread.add(user, task())
-            return self.schedule(func=immediate_task, trigger='date')
+            return self.schedule(func=immediate_task, trigger='date', name=name)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks_immediately(self, tasks, user=None):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task_immediately(task, user)
+                self.schedule_task_immediately(task[0], user, name="immediately " + task[1])
 
     # Remove all jobs
     def remove_all_jobs(self):
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 00bd09ad..3601ff93 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -487,7 +487,10 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         return 'ThumbnailsClear'
 
     def __str__(self):
-        return "Delete Thumbnail cache directory"
+        if self.book_id > 0:
+            return "Delete Thumbnail cache for book " + str(self.book_id)
+        else:
+            return "Delete Thumbnail cache directory"
 
     @property
     def is_cancellable(self):

From f5b79930ad56f62281d7e173f23558178d55215b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 20 Mar 2022 20:02:57 +0100
Subject: [PATCH 162/220] Bugfix remember sort order of series and authors if
 entered from link below book cover (#2340)

---
 cps/templates/author.html    |  8 ++++----
 cps/templates/discover.html  |  6 +++---
 cps/templates/index.html     | 12 ++++++------
 cps/templates/languages.html |  2 +-
 cps/templates/search.html    |  6 +++---
 cps/templates/shelf.html     |  6 +++---
 cps/templates/shelfdown.html |  4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/cps/templates/author.html b/cps/templates/author.html
index fc811368..b691d398 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -52,7 +52,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -60,7 +60,7 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.data %}
@@ -71,7 +71,7 @@
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
@@ -123,7 +123,7 @@
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index bceb6a8a..852d6210 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -25,7 +25,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -33,13 +33,13 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/index.html b/cps/templates/index.html
index b69a9284..79ee29b6 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -24,7 +24,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -32,13 +32,13 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
@@ -106,7 +106,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='new') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='stored') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -114,7 +114,7 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='new') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='stored') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.data %}
@@ -125,7 +125,7 @@
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/languages.html b/cps/templates/languages.html
index 8331cb94..c83398d5 100644
--- a/cps/templates/languages.html
+++ b/cps/templates/languages.html
@@ -23,7 +23,7 @@
     {% endif %}
     <div class="row" data-id="{{lang[0].name}}">
         <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{lang[1]}}</span></div>
-        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{{url_for('web.books_list', book_id=lang[0].lang_code, data=data, sort_param='new')}}">{{lang[0].name}}</a></div>
+        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{{url_for('web.books_list', book_id=lang[0].lang_code, data=data, sort_param='stored')}}">{{lang[0].name}}</a></div>
     </div>
   {% endfor %}
       </div>
diff --git a/cps/templates/search.html b/cps/templates/search.html
index a7ba5e68..4f8d607b 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -61,7 +61,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
               {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -69,7 +69,7 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
           {% for format in entry.Books.data %}
@@ -80,7 +80,7 @@
         </p>
         {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.Books.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
             {{entry.Books.series[0].name}}
           </a>
           ({{entry.Books.series_index|formatseriesindex}})
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index 2e4cf906..e5cb2ffb 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -49,7 +49,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -57,13 +57,13 @@
               {% if not loop.first %}
                 <span>&amp;</span>
               {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index|formatseriesindex}})
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index 78f00b5e..c800dca7 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -38,7 +38,7 @@
         <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
           {% for author in entry.ordered_authors %}
-            <a href="{{url_for('web.books_list',  data='author', sort_param='new', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
+            <a href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
@@ -46,7 +46,7 @@
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='new', book_id=entry.series[0].id )}}">
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
           ({{entry.series_index}})

From 0d49b56883dc525a8b687d84f070e29363625144 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 21 Mar 2022 18:50:02 +0100
Subject: [PATCH 163/220] Update gmail.json location

---
 README.md             | 2 +-
 cps/services/gmail.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d9c50f7f..fb8bcd7f 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 1. To avoid problems with already installed python dependencies, it's recommended to create a virtual environment for Calibre-Web
 2. Install Calibre-Web via pip with the command `pip install calibreweb` (Depending on your OS and or distro the command could also be `pip3`). 
 3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
-4. Calibre-Web can be started afterwards by typing `cps` or `python3 -m cps` 
+4. Calibre-Web can be started afterwards by typing `cps` 
 
 In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20)
 
diff --git a/cps/services/gmail.py b/cps/services/gmail.py
index ff36b308..3a4eab7f 100644
--- a/cps/services/gmail.py
+++ b/cps/services/gmail.py
@@ -25,7 +25,7 @@ from google.oauth2.credentials import Credentials
 from datetime import datetime
 import base64
 from flask_babel import gettext as _
-from ..constants import BASE_DIR
+from ..constants import CONFIG_DIR
 from .. import logger
 
 
@@ -53,11 +53,11 @@ def setup_gmail(token):
         if creds and creds.expired and creds.refresh_token:
             creds.refresh(Request())
         else:
-            cred_file = os.path.join(BASE_DIR, 'gmail.json')
+            cred_file = os.path.join(CONFIG_DIR, 'gmail.json')
             if not os.path.exists(cred_file):
                 raise Exception(_("Found no valid gmail.json file with OAuth information"))
             flow = InstalledAppFlow.from_client_secrets_file(
-                os.path.join(BASE_DIR, 'gmail.json'), SCOPES)
+                os.path.join(CONFIG_DIR, 'gmail.json'), SCOPES)
             creds = flow.run_local_server(port=0)
             user_info = get_user_info(creds)
         return {

From a6a8f7eb43ddf3d4a740288fdf73eb38d7adaa50 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 21 Mar 2022 19:33:57 +0100
Subject: [PATCH 164/220] Series Link in series view no longer clickable

---
 cps/templates/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cps/templates/index.html b/cps/templates/index.html
index 79ee29b6..28807343 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -125,9 +125,13 @@
         </p>
         {% if entry.series.__len__() > 0 %}
         <p class="series">
+        {% if page != "series" %}
           <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
             {{entry.series[0].name}}
           </a>
+        {% else %}
+            <span>{{entry.series[0].name}}</span>
+        {% endif %}
           ({{entry.series_index|formatseriesindex}})
         </p>
         {% endif %}

From 504e58abdb2907663979daab8a395ddafbadfa23 Mon Sep 17 00:00:00 2001
From: Nicolas Ferrari <nferrari@alwaysdata.com>
Date: Tue, 22 Mar 2022 06:49:51 +0100
Subject: [PATCH 165/220] Installation on a Cloud Provider wiki link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fb8bcd7f..94be5b33 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 3. Optional features can also be installed via pip, please refer to [this page](https://github.com/janeczku/calibre-web/wiki/Dependencies-in-Calibre-Web-Linux-Windows) for details 
 4. Calibre-Web can be started afterwards by typing `cps` 
 
-In the Wiki there are also examples for a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation) and for installation on [Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20)
+In the Wiki there are also examples for: a [manual installation](https://github.com/janeczku/calibre-web/wiki/Manual-installation), [installation on Linux Mint](https://github.com/janeczku/calibre-web/wiki/How-To:Install-Calibre-Web-in-Linux-Mint-19-or-20), [installation on a Cloud Provider](https://github.com/janeczku/calibre-web/wiki/How-To:-Install-Calibre-Web-on-a-Cloud-Provider).
 
 ## Quick start
 

From 2a5e9a97bbaeaa92f989374d47b531b01e8a6ad3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 24 Mar 2022 18:19:41 +0100
Subject: [PATCH 166/220] Fix #2349 (import error on python <3.7 dataclasses
 solved)

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

diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index d72273f6..79e27554 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -23,7 +23,7 @@ import json
 import os
 import sys
 # from time import time
-from dataclasses import asdict
+
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
@@ -32,7 +32,7 @@ from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
 
 from cps.services.Metadata import Metadata
-from . import constants, get_locale, logger, ub
+from . import constants, get_locale, logger, ub, web_server
 
 # current_milli_time = lambda: int(round(time() * 1000))
 
@@ -40,6 +40,14 @@ meta = Blueprint("metadata", __name__)
 
 log = logger.create()
 
+try:
+    from dataclasses import asdict
+except ImportError:
+    log.info('*** "dataclasses" is needed for calibre-web to run. Please install it using pip: "pip install dataclasses" ***')
+    print('*** "dataclasses" is needed for calibre-web to run. Please install it using pip: "pip install dataclasses" ***')
+    web_server.stop(True)
+    sys.exit(6)
+
 new_list = list()
 meta_dir = os.path.join(constants.BASE_DIR, "cps", "metadata_provider")
 modules = os.listdir(os.path.join(constants.BASE_DIR, "cps", "metadata_provider"))

From 14a6e7c42c6d27369467a05986a82f16d73290f8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 25 Mar 2022 18:30:12 +0100
Subject: [PATCH 167/220] Deactivated several functions for kindle tolino and
 kobo. Opening books now working for ebook readers

---
 cps/admin.py                         |  2 +-
 cps/render_template.py               | 19 ++++++++++---------
 cps/templates/admin.html             |  4 +++-
 cps/templates/book_exists_flash.html |  4 ++--
 cps/templates/config_view_edit.html  |  2 ++
 cps/templates/discover.html          |  4 ++--
 cps/templates/email_edit.html        |  2 +-
 cps/templates/index.html             | 10 +++++-----
 cps/templates/layout.html            |  2 +-
 cps/templates/search.html            |  4 ++--
 cps/templates/shelf.html             |  4 ++--
 cps/templates/user_edit.html         |  4 ++--
 12 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 447e0227..1004ee78 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1493,7 +1493,7 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
             content.role &= ~constants.ROLE_ANONYMOUS
 
         val = [int(k[5:]) for k in to_save if k.startswith('show_')]
-        sidebar = get_sidebar_config()
+        sidebar, __ = get_sidebar_config()
         for element in sidebar:
             value = element['visibility']
             if value in val and not content.check_visibility(value):
diff --git a/cps/render_template.py b/cps/render_template.py
index 09a32497..91118049 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -16,7 +16,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from flask import render_template
+from flask import render_template, request
 from flask_babel import gettext as _
 from flask import g
 from werkzeug.local import LocalProxy
@@ -30,6 +30,7 @@ log = logger.create()
 
 def get_sidebar_config(kwargs=None):
     kwargs = kwargs or []
+    simple = bool([e for e in ['kindle', 'tolino', "kobo"] if (e in request.headers.get('User-Agent', "").lower())])
     if 'content' in kwargs:
         content = kwargs['content']
         content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()
@@ -93,12 +94,12 @@ def get_sidebar_config(kwargs=None):
         {"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": content})
-    sidebar.append(
-        {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
-         "visibility": constants.SIDEBAR_LIST, 'public': (not g.user.is_anonymous), "page": "list",
-         "show_text": _('Show Books List'), "config_show": content})
-
-    return sidebar
+    if not simple:
+        sidebar.append(
+            {"glyph": "glyphicon-th-list", "text": _('Books List'), "link": 'web.books_table', "id": "list",
+             "visibility": constants.SIDEBAR_LIST, 'public': (not g.user.is_anonymous), "page": "list",
+             "show_text": _('Show Books List'), "config_show": content})
+    return sidebar, simple
 
 def get_readbooks_ids():
     if not config.config_read_column:
@@ -116,7 +117,7 @@ def get_readbooks_ids():
 
 # Returns the template for rendering and includes the instance name
 def render_title_template(*args, **kwargs):
-    sidebar = get_sidebar_config(kwargs)
-    return render_template(instance=config.config_calibre_web_title, sidebar=sidebar,
+    sidebar, simple = get_sidebar_config(kwargs)
+    return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
                            accept=constants.EXTENSIONS_UPLOAD, read_book_ids=get_readbooks_ids(),
                            *args, **kwargs)
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 6cd7815e..c8c6eb82 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -47,7 +47,9 @@
         {% endfor %}
       </table>
     {% endif %}
-        <a class="btn btn-default" id="admin_user_table" href="{{url_for('admin.edit_user_table')}}">{{_('Edit Users')}}</a>
+        {% if not simple %}
+          <a class="btn btn-default" id="admin_user_table" href="{{url_for('admin.edit_user_table')}}">{{_('Edit Users')}}</a>
+        {% endif %}
         <a class="btn btn-default" id="admin_new_user" href="{{url_for('admin.new_user')}}">{{_('Add New User')}}</a>
       {% if (config.config_login_type == 1) %}
         <div class="btn btn-default" id="import_ldap_users" data-toggle="modal" data-target="#StatusDialog">{{_('Import LDAP Users')}}</div>
diff --git a/cps/templates/book_exists_flash.html b/cps/templates/book_exists_flash.html
index b0855120..b55192ce 100644
--- a/cps/templates/book_exists_flash.html
+++ b/cps/templates/book_exists_flash.html
@@ -1,3 +1,3 @@
-<a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+<a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
 	<span class="title">{{entry.title|shortentitle}}</span>
-</a>
\ No newline at end of file
+</a>
diff --git a/cps/templates/config_view_edit.html b/cps/templates/config_view_edit.html
index 1dc02a5e..e4fea44d 100644
--- a/cps/templates/config_view_edit.html
+++ b/cps/templates/config_view_edit.html
@@ -162,8 +162,10 @@
             <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if conf.show_detail_random() %}checked{% endif %}>
             <label for="Show_detail_random">{{_('Show Random Books in Detail View')}}</label>
         </div>
+      {% if not simple %}
         <a href="#" id="get_tags" data-id="0" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied Tags')}}</a>
         <a href="#" id="get_column_values" data-id="0" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied custom column values')}}</a>
+      {% endif %}
       </div>
     </div>
   </div>
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
index 852d6210..900dad8c 100644
--- a/cps/templates/discover.html
+++ b/cps/templates/discover.html
@@ -7,7 +7,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         {% if entry.has_cover is defined %}
-          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{entry.title}}">
               <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
@@ -16,7 +16,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/email_edit.html b/cps/templates/email_edit.html
index 9f23f78b..2a844209 100644
--- a/cps/templates/email_edit.html
+++ b/cps/templates/email_edit.html
@@ -69,7 +69,7 @@
    {% endif %}
       <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Back')}}</a>
   </form>
-    {% if g.allow_registration %}
+    {% if g.allow_registration and not simple%}
   <div class="col-md-10 col-lg-6">
     <h2>{{_('Allowed Domains (Whitelist)')}}</h2>
     <form id="domain_add_allow" action="{{ url_for('admin.add_domain',allow=1)}}" method="POST">
diff --git a/cps/templates/index.html b/cps/templates/index.html
index 28807343..a4547705 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -7,7 +7,7 @@
    {% for entry in random %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
-          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
               <span class="img" title="{{ entry.title }}">
                 <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
@@ -15,7 +15,7 @@
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
@@ -24,7 +24,7 @@
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
 			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
+              <a class="author-name author-hidden" href="{{url_for('web.books_list', data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
               {% if loop.last %}
                 <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
               {% endif %}
@@ -89,7 +89,7 @@
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books">
       <div class="cover">
-          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{ entry.title }}">
               <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
               {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
@@ -97,7 +97,7 @@
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 0d0df778..46f03da1 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -69,7 +69,7 @@
                     </form>
                   </li>
               {% endif %}
-              {% if not g.user.is_anonymous %}
+              {% if not g.user.is_anonymous and not simple%}
                 <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 4f8d607b..77c01c80 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -43,7 +43,7 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
         {% if entry.Books.has_cover is defined %}
-           <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+           <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{entry.Books.title}}" >
                 <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
                 {% if entry.Books.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
@@ -52,7 +52,7 @@
         {% endif %}
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index e5cb2ffb..a7b5bcf0 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -32,7 +32,7 @@
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
-            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
               <span class="img" title="{{entry.title}}" >
                 <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
                 {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
@@ -40,7 +40,7 @@
             </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" data-toggle="modal" data-target="#bookDetailsModal" data-remote="false">
+        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
           <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
         </a>
         <p class="author">
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index de7a4fb3..b489cbaf 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -83,7 +83,7 @@
           <input type="checkbox" name="Show_detail_random" id="Show_detail_random" {% if content.show_detail_random() %}checked{% endif %}>
           <label for="Show_detail_random">{{_('Show Random Books in Detail View')}}</label>
       </div>
-      {% if ( g.user and g.user.role_admin() and not new_user ) %}
+      {% if ( g.user and g.user.role_admin() and not new_user ) and not simple %}
       <a href="#" id="get_user_tags" class="btn btn-default" data-id="{{content.id}}" data-toggle="modal" data-target="#restrictModal">{{_('Add Allowed/Denied Tags')}}</a>
       <a href="#" id="get_user_column_values" data-id="{{content.id}}" class="btn btn-default" data-toggle="modal" data-target="#restrictModal">{{_('Add allowed/Denied Custom Column Values')}}</a>
       {% endif %}
@@ -131,7 +131,7 @@
       </div>
     {% endif %}
   {% endif %}
-    {% if kobo_support and not content.role_anonymous() %}
+    {% if kobo_support and not content.role_anonymous() and not simple%}
     <div class="form-group">
       <input type="checkbox" name="kobo_only_shelves_sync" id="kobo_only_shelves_sync" {% if content.kobo_only_shelves_sync %}checked{% endif %}>
       <label for="kobo_only_shelves_sync">{{_('Sync only books in selected shelves with Kobo')}}</label>

From 32a3c45ee0f7e13bd61075f32a4dcebc415585a1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 26 Mar 2022 19:35:56 +0100
Subject: [PATCH 168/220] Refactored load read status for web access and opds
 access Refactored and removed discover html page Bugfix show author Bugfix
 open dialog in author page Fix for #2341 (advanced search with linked read
 column and read column having a higher number than number of available custom
 columns)

---
 cps/db.py                               |   53 +-
 cps/opds.py                             |   68 +-
 cps/render_template.py                  |    6 +-
 cps/shelf.py                            |    2 +-
 cps/templates/author.html               |   32 +-
 cps/templates/discover.html             |   65 --
 cps/templates/feed.xml                  |   32 +-
 cps/templates/index.html                |   61 +-
 cps/templates/search.html               |    2 +-
 cps/templates/shelf.html                |   26 +-
 cps/templates/shelfdown.html            |   18 +-
 cps/web.py                              |  141 ++-
 test/Calibre-Web TestSummary_Linux.html | 1042 ++++++++++++++---------
 13 files changed, 846 insertions(+), 702 deletions(-)
 delete mode 100644 cps/templates/discover.html

diff --git a/cps/db.py b/cps/db.py
index f2fe9b78..3b193e1a 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -680,6 +680,25 @@ class CalibreDB:
         return and_(lang_filter, pos_content_tags_filter, ~neg_content_tags_filter,
                     pos_content_cc_filter, ~neg_content_cc_filter, archived_filter)
 
+    def generate_linked_query(self, config_read_column, database):
+        if not config_read_column:
+            query = (self.session.query(database, ub.ArchivedBook.is_archived, ub.ReadBook.read_status)
+                     .select_from(Books)
+                     .outerjoin(ub.ReadBook,
+                                and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
+        else:
+            try:
+                read_column = cc_classes[config_read_column]
+                query = (self.session.query(database, ub.ArchivedBook.is_archived, read_column.value)
+                         .select_from(Books)
+                         .outerjoin(read_column, read_column.book == Books.id))
+            except (KeyError, AttributeError, IndexError):
+                log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
+                # Skip linking read column and return None instead of read status
+                query = self.session.query(database, None, ub.ArchivedBook.is_archived)
+        return query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
+                                                     int(current_user.id) == ub.ArchivedBook.user_id))
+
     @staticmethod
     def get_checkbox_sorted(inputlist, state, offset, limit, order, combo=False):
         outcome = list()
@@ -709,30 +728,14 @@ class CalibreDB:
                                            join_archive_read, config_read_column, *join):
         pagesize = pagesize or self.config.config_books_per_page
         if current_user.show_detail_random():
-            randm = self.session.query(Books) \
-                .filter(self.common_filters(allow_show_archived)) \
-                .order_by(func.random()) \
-                .limit(self.config.config_random_books).all()
+            random_query = self.generate_linked_query(config_read_column, database)
+            randm = (random_query.filter(self.common_filters(allow_show_archived))
+                     .order_by(func.random())
+                     .limit(self.config.config_random_books).all())
         else:
             randm = false()
         if join_archive_read:
-            if not config_read_column:
-                query = (self.session.query(database, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
-                         .select_from(Books)
-                         .outerjoin(ub.ReadBook,
-                                    and_(ub.ReadBook.user_id == int(current_user.id), ub.ReadBook.book_id == Books.id)))
-            else:
-                try:
-                    read_column = cc_classes[config_read_column]
-                    query = (self.session.query(database, read_column.value, ub.ArchivedBook.is_archived)
-                             .select_from(Books)
-                             .outerjoin(read_column, read_column.book == Books.id))
-                except (KeyError, AttributeError, IndexError):
-                    log.error("Custom Column No.{} is not existing in calibre database".format(read_column))
-                    # Skip linking read column and return None instead of read status
-                    query = self.session.query(database, None, ub.ArchivedBook.is_archived)
-            query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
-                                                          int(current_user.id) == ub.ArchivedBook.user_id))
+            query = self.generate_linked_query(config_read_column, database)
         else:
             query = self.session.query(database)
         off = int(int(pagesize) * (page - 1))
@@ -830,21 +833,23 @@ class CalibreDB:
         authorterms = re.split("[, ]+", term)
         for authorterm in authorterms:
             q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
-        if not config_read_column:
+        query = self.generate_linked_query(config_read_column, Books)
+        '''if not config_read_column:
             query = (self.session.query(Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(Books)
                      .outerjoin(ub.ReadBook, and_(Books.id == ub.ReadBook.book_id,
                                                   int(current_user.id) == ub.ReadBook.user_id)))
         else:
             try:
                 read_column = cc_classes[config_read_column]
-                query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value).select_from(Books)
+                query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value)
+                         .select_from(Books)
                          .outerjoin(read_column, read_column.book == Books.id))
             except (KeyError, AttributeError, IndexError):
                 log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
                 # Skip linking read column
                 query = self.session.query(Books, ub.ArchivedBook.is_archived, None)
         query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
-                                                      int(current_user.id) == ub.ArchivedBook.user_id))
+                                                      int(current_user.id) == ub.ArchivedBook.user_id))'''
 
         if len(join) == 6:
             query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
diff --git a/cps/opds.py b/cps/opds.py
index 180fcacb..702ffe1e 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -26,7 +26,8 @@ from functools import wraps
 
 from flask import Blueprint, request, render_template, Response, g, make_response, abort
 from flask_login import current_user
-from sqlalchemy.sql.expression import func, text, or_, and_, any_, true
+from sqlalchemy.sql.expression import func, text, or_, and_, true
+from sqlalchemy.exc import InvalidRequestError, OperationalError
 from werkzeug.security import check_password_hash
 from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages
 from .helper import get_download_link, get_book_cover
@@ -108,7 +109,8 @@ def feed_letter_books(book_id):
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         letter,
-                                                        [db.Books.sort])
+                                                        [db.Books.sort],
+                                                        True, config.config_read_column)
 
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -118,15 +120,16 @@ def feed_letter_books(book_id):
 def feed_new():
     off = request.args.get("offset") or 0
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
-                                                        db.Books, True, [db.Books.timestamp.desc()])
+                                                        db.Books, True, [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
 @opds.route("/opds/discover")
 @requires_basic_auth_if_no_ano
 def feed_discover():
-    entries = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).order_by(func.random())\
-        .limit(config.config_books_per_page)
+    query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+    entries = query.filter(calibre_db.common_filters()).order_by(func.random()).limit(config.config_books_per_page)
     pagination = Pagination(1, config.config_books_per_page, int(config.config_books_per_page))
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
@@ -137,7 +140,8 @@ def feed_best_rated():
     off = request.args.get("offset") or 0
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books, db.Books.ratings.any(db.Ratings.rating > 9),
-                                                        [db.Books.timestamp.desc()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -150,11 +154,11 @@ def feed_hot():
     hot_books = all_books.offset(off).limit(config.config_books_per_page)
     entries = list()
     for book in hot_books:
-        download_book = calibre_db.get_book(book.Downloads.book_id)
+        query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+        download_book = query.filter(calibre_db.common_filters()).filter(
+            book.Downloads.book_id == db.Books.id).first()
         if download_book:
-            entries.append(
-                calibre_db.get_filtered_book(book.Downloads.book_id)
-            )
+            entries.append(download_book)
         else:
             ub.delete_download(book.Downloads.book_id)
     num_books = entries.__len__()
@@ -270,7 +274,8 @@ def feed_series(book_id):
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.series.any(db.Series.id == book_id),
-                                                        [db.Books.series_index])
+                                                        [db.Books.series_index],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -324,7 +329,8 @@ def feed_format(book_id):
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.data.any(db.Data.format == book_id.upper()),
-                                                        [db.Books.timestamp.desc()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -351,7 +357,8 @@ def feed_languages(book_id):
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         db.Books.languages.any(db.Languages.id == book_id),
-                                                        [db.Books.timestamp.desc()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
@@ -381,13 +388,25 @@ def feed_shelf(book_id):
     result = list()
     # user is allowed to access shelf
     if shelf:
-        books_in_shelf = ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == book_id).order_by(
-            ub.BookShelf.order.asc()).all()
-        for book in books_in_shelf:
-            cur_book = calibre_db.get_book(book.book_id)
-            result.append(cur_book)
-    pagination = Pagination((int(off) / (int(config.config_books_per_page)) + 1), config.config_books_per_page,
-                            len(result))
+        result, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
+                                                           config.config_books_per_page,
+                                                           db.Books,
+                                                           ub.BookShelf.shelf == shelf.id,
+                                                           [ub.BookShelf.order.asc()],
+                                                           True, config.config_read_column,
+                                                           ub.BookShelf, ub.BookShelf.book_id == db.Books.id)
+        # delete shelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web
+        wrong_entries = calibre_db.session.query(ub.BookShelf) \
+            .join(db.Books, ub.BookShelf.book_id == db.Books.id, isouter=True) \
+            .filter(db.Books.id == None).all()
+        for entry in wrong_entries:
+            log.info('Not existing book {} in {} deleted'.format(entry.book_id, shelf))
+            try:
+                ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == entry.book_id).delete()
+                ub.session.commit()
+            except (OperationalError, InvalidRequestError) as e:
+                ub.session.rollback()
+                log.error_or_exception("Settings Database error: {}".format(e))
     return render_xml_template('feed.xml', entries=result, pagination=pagination)
 
 
@@ -451,8 +470,7 @@ def feed_search(term):
         entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
         entries_count = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entries_count, entries_count)
-        items = [entry[0] for entry in entries]
-        return render_xml_template('feed.xml', searchterm=term, entries=items, pagination=pagination)
+        return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
     else:
         return render_xml_template('feed.xml', searchterm="")
 
@@ -493,14 +511,16 @@ def render_xml_dataset(data_table, book_id):
     entries, __, pagination = calibre_db.fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), 0,
                                                         db.Books,
                                                         getattr(db.Books, data_table.__tablename__).any(data_table.id == book_id),
-                                                        [db.Books.timestamp.desc()])
+                                                        [db.Books.timestamp.desc()],
+                                                        True, config.config_read_column)
     return render_xml_template('feed.xml', entries=entries, pagination=pagination)
 
 
 def render_element_index(database_column, linked_table, folder):
     shift = 0
     off = int(request.args.get("offset") or 0)
-    entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'))
+    entries = calibre_db.session.query(func.upper(func.substr(database_column, 1, 1)).label('id'), None, None)
+    # query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
     if linked_table is not None:
         entries = entries.join(linked_table).join(db.Books)
     entries = entries.filter(calibre_db.common_filters()).group_by(func.upper(func.substr(database_column, 1, 1))).all()
diff --git a/cps/render_template.py b/cps/render_template.py
index 91118049..1bc5454d 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -101,7 +101,7 @@ def get_sidebar_config(kwargs=None):
              "show_text": _('Show Books List'), "config_show": content})
     return sidebar, simple
 
-def get_readbooks_ids():
+'''def get_readbooks_ids():
     if not config.config_read_column:
         readBooks = ub.session.query(ub.ReadBook).filter(ub.ReadBook.user_id == int(current_user.id))\
             .filter(ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED).all()
@@ -113,11 +113,11 @@ def get_readbooks_ids():
             return frozenset([x.book for x in readBooks])
         except (KeyError, AttributeError, IndexError):
             log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-            return []
+            return []'''
 
 # Returns the template for rendering and includes the instance name
 def render_title_template(*args, **kwargs):
     sidebar, simple = get_sidebar_config(kwargs)
     return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
-                           accept=constants.EXTENSIONS_UPLOAD, read_book_ids=get_readbooks_ids(),
+                           accept=constants.EXTENSIONS_UPLOAD, # read_book_ids=get_readbooks_ids(),
                            *args, **kwargs)
diff --git a/cps/shelf.py b/cps/shelf.py
index 0bf12164..35f2941d 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -439,7 +439,7 @@ def render_show_shelf(shelf_type, shelf_id, page_no, sort_param):
                                                            db.Books,
                                                            ub.BookShelf.shelf == shelf_id,
                                                            [ub.BookShelf.order.asc()],
-                                                           False, 0,
+                                                           True, config.config_read_column,
                                                            ub.BookShelf, ub.BookShelf.book_id == db.Books.id)
         # delete chelf entries where book is not existent anymore, can happen if book is deleted outside calibre-web
         wrong_entries = calibre_db.session.query(ub.BookShelf) \
diff --git a/cps/templates/author.html b/cps/templates/author.html
index b691d398..f7aeb3e1 100644
--- a/cps/templates/author.html
+++ b/cps/templates/author.html
@@ -31,23 +31,22 @@
       <a id="pub_old" data-toggle="tooltip" title="{{_('Sort according to publishing date, oldest first')}}" class="btn btn-primary{% if order == "pubold" %} active{% endif%}" href="{{url_for('web.books_list', data='author', book_id=id, sort_param='pubold')}}"><span class="glyphicon glyphicon-calendar"></span><span class="glyphicon glyphicon-sort-by-order-alt"></span></a>
     </div>
   <div class="row display-flex">
-    {% if entries[0] %}
     {% for entry in entries %}
     <div id="books" class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-            <span class="img" title="{{entry.title}}">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" />
-              {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+            <span class="img" title="{{entry.Books.title}}">
+              <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" />
+              {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
         </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}">
-          <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{ entry.Books.title }}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -63,23 +62,23 @@
               <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
-          {% for format in entry.data %}
+          {% for format in entry.Books.data %}
             {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
           <span class="glyphicon glyphicon-star good"></span>
           {% if loop.last and loop.index < 5 %}
           {% for numer in range(5 - loop.index) %}
@@ -92,7 +91,6 @@
       </div>
     </div>
     {% endfor %}
-    {% endif %}
   </div>
 </div>
 
@@ -110,7 +108,7 @@
       <div class="meta">
         <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
         <p class="author">
-		  {% for author in entry.ordered_authors %}
+		  {% for author in entry.authors %}
 			{% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
 				<a class="author-name author-hidden" href="https://www.goodreads.com/author/show/{{ author.gid }}" target="_blank" rel="noopener">{{author.name.replace('|',',')}}</a>
 				{% if loop.last %}
diff --git a/cps/templates/discover.html b/cps/templates/discover.html
deleted file mode 100644
index 900dad8c..00000000
--- a/cps/templates/discover.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% extends "layout.html" %}
-{% block body %}
-<div class="discover load-more">
-  <h2>{{title}}</h2>
-  <div class="row display-flex">
-    {% for entry in entries %}
-    <div class="col-sm-3 col-lg-2 col-xs-6 book">
-      <div class="cover">
-        {% if entry.has_cover is defined %}
-          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-            <span class="img" title="{{entry.title}}">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
-              {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
-            </span>
-          </a>
-        {% endif %}
-      </div>
-      <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
-        </a>
-        <p class="author">
-          {% for author in entry.ordered_authors %}
-            {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
-              {% if not loop.first %}
-                <span class="author-hidden-divider">&amp;</span>
-			  {% endif %}
-              <a class="author-name author-hidden" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
-              {% if loop.last %}
-                <a href="#" class="author-expand" data-authors-max="{{g.config_authors_max}}" data-collapse-caption="({{_('reduce')}})">(...)</a>
-              {% endif %}
-            {% else %}
-              {% if not loop.first %}
-                <span>&amp;</span>
-              {% endif %}
-              <a class="author-name" href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
-            {% endif %}
-          {% endfor %}
-        </p>
-        {% if entry.series.__len__() > 0 %}
-        <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
-          </a>
-          ({{entry.series_index|formatseriesindex}})
-        </p>
-        {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
-        <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
-            <span class="glyphicon glyphicon-star good"></span>
-            {% if loop.last and loop.index < 5 %}
-              {% for numer in range(5 - loop.index) %}
-                <span class="glyphicon glyphicon-star-empty"></span>
-              {% endfor %}
-            {% endif %}
-          {% endfor %}
-        </div>
-        {% endif %}
-      </div>
-    </div>
-    {% endfor %}
-  </div>
-</div>
-{% endblock %}
diff --git a/cps/templates/feed.xml b/cps/templates/feed.xml
index 9073142e..940fb0da 100644
--- a/cps/templates/feed.xml
+++ b/cps/templates/feed.xml
@@ -40,35 +40,35 @@
   {% if entries and entries[0] %}
   {% for entry in entries %}
   <entry>
-    <title>{{entry.title}}</title>
-    <id>urn:uuid:{{entry.uuid}}</id>
-    <updated>{{entry.atom_timestamp}}</updated>
-    {% if entry.authors.__len__() > 0 %}
+    <title>{{entry.Books.title}}</title>
+    <id>urn:uuid:{{entry.Books.uuid}}</id>
+    <updated>{{entry.Books.atom_timestamp}}</updated>
+    {% if entry.Books.authors.__len__() > 0 %}
       <author>
-        <name>{{entry.authors[0].name}}</name>
+        <name>{{entry.Books.authors[0].name}}</name>
       </author>
     {% endif %}
-    {% if entry.publishers.__len__() > 0 %}
+    {% if entry.Books.publishers.__len__() > 0 %}
       <publisher>
-        <name>{{entry.publishers[0].name}}</name>
+        <name>{{entry.Books.publishers[0].name}}</name>
       </publisher>
     {% endif %}
-    {% for lang in entry.languages %}
+    {% for lang in entry.Books.languages %}
       <dcterms:language>{{lang.lang_code}}</dcterms:language>
     {% endfor %}
-    {% for tag in entry.tags %}
+    {% for tag in entry.Books.tags %}
     <category scheme="http://www.bisg.org/standards/bisac_subject/index.html"
               term="{{tag.name}}"
               label="{{tag.name}}"/>
     {% endfor %}
-    {% if entry.comments[0] %}<summary>{{entry.comments[0].text|striptags}}</summary>{% endif %}
-    {% if entry.has_cover %}
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image"/>
-    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
+    {% if entry.Books.comments[0] %}<summary>{{entry.Books.comments[0].text|striptags}}</summary>{% endif %}
+    {% if entry.Books.has_cover %}
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.Books.id)}}" rel="http://opds-spec.org/image"/>
+    <link type="image/jpeg" href="{{url_for('opds.feed_get_cover', book_id=entry.Books.id)}}" rel="http://opds-spec.org/image/thumbnail"/>
     {% endif %}
-    {% for format in entry.data %}
-    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.id, book_format=format.format|lower)}}"
-          length="{{format.uncompressed_size}}" mtime="{{entry.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
+    {% for format in entry.Books.data %}
+    <link rel="http://opds-spec.org/acquisition" href="{{ url_for('opds.opds_download_link', book_id=entry.Books.id, book_format=format.format|lower)}}"
+          length="{{format.uncompressed_size}}" mtime="{{entry.Books.atom_timestamp}}" type="{{format.format|lower|mimetype}}"/>
     {% endfor %}
   </entry>
   {% endfor %}
diff --git a/cps/templates/index.html b/cps/templates/index.html
index a4547705..4cbf520e 100644
--- a/cps/templates/index.html
+++ b/cps/templates/index.html
@@ -1,25 +1,25 @@
 {% extends "layout.html" %}
 {% block body %}
-{% if g.user.show_detail_random() %}
+{% if g.user.show_detail_random() and page != "discover" %}
 <div class="discover random-books">
   <h2 class="random-books">{{_('Discover (Random Books)')}}</h2>
   <div class="row display-flex">
    {% for entry in random %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books_rand">
       <div class="cover">
-          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-              <span class="img" title="{{ entry.title }}">
-                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
-                {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+          <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+              <span class="img" title="{{ entry.Books.title }}">
+                <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
+                {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -36,17 +36,17 @@
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
             <span class="glyphicon glyphicon-star good"></span>
             {% if loop.last and loop.index < 5 %}
               {% for numer in range(5 - loop.index) %}
@@ -64,6 +64,7 @@
 {% endif %}
 <div class="discover load-more">
   <h2 class="{{title}}">{{title}}</h2>
+   {% if page != 'discover' %}
     <div class="filterheader hidden-xs">
     {% if page == 'hot' %}
       <a data-toggle="tooltip" title="{{_('Sort ascending according to download count')}}" id="hot_asc" class="btn btn-primary{% if order == "hotasc" %} active{% endif%}" href="{{url_for('web.books_list', data=page, book_id=id, sort_param='hotasc')}}"><span class="glyphicon glyphicon-sort-by-order"></span></a>
@@ -83,25 +84,25 @@
       {% endif %}
     {% endif %}
     </div>
-
+   {% endif %}
   <div class="row display-flex">
     {% if entries[0] %}
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book" id="books">
       <div class="cover">
-          <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-            <span class="img" title="{{ entry.title }}">
-              <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}"/>
-              {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+          <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+            <span class="img" title="{{ entry.Books.title }}">
+              <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}"/>
+              {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{ entry.title }}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{ entry.Books.title }}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -117,27 +118,27 @@
               <a class="author-name" href="{{url_for('web.books_list', data='author', book_id=author.id, sort_param='stored') }}">{{author.name.replace('|',',')|shortentitle(30)}}</a>
             {% endif %}
           {% endfor %}
-          {% for format in entry.data %}
+          {% for format in entry.Books.data %}
             {% if format.format|lower in g.constants.EXTENSIONS_AUDIO %}
             <span class="glyphicon glyphicon-music"></span>
             {% endif %}
           {%endfor%}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
         {% if page != "series" %}
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
         {% else %}
-            <span>{{entry.series[0].name}}</span>
+            <span>{{entry.Books.series[0].name}}</span>
         {% endif %}
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
             <span class="glyphicon glyphicon-star good"></span>
             {% if loop.last and loop.index < 5 %}
               {% for numer in range(5 - loop.index) %}
diff --git a/cps/templates/search.html b/cps/templates/search.html
index 77c01c80..318d06f1 100644
--- a/cps/templates/search.html
+++ b/cps/templates/search.html
@@ -46,7 +46,7 @@
            <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
             <span class="img" title="{{entry.Books.title}}" >
                 <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
-                {% if entry.Books.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+                {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
             </span>
           </a>
         {% endif %}
diff --git a/cps/templates/shelf.html b/cps/templates/shelf.html
index a7b5bcf0..0e9b0bd5 100644
--- a/cps/templates/shelf.html
+++ b/cps/templates/shelf.html
@@ -32,19 +32,19 @@
     {% for entry in entries %}
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
       <div class="cover">
-            <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-              <span class="img" title="{{entry.title}}" >
-                <img src="{{ url_for('web.get_cover', book_id=entry.id) }}" alt="{{ entry.title }}" />
-                {% if entry.id in read_book_ids %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
+            <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+              <span class="img" title="{{entry.Books.title}}" >
+                <img src="{{ url_for('web.get_cover', book_id=entry.Books.id) }}" alt="{{ entry.Books.title }}" />
+                {% if entry[2] == True %}<span class="badge read glyphicon glyphicon-ok"></span>{% endif %}
               </span>
             </a>
       </div>
       <div class="meta">
-        <a href="{{ url_for('web.show_book', book_id=entry.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
-          <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
+        <a href="{{ url_for('web.show_book', book_id=entry.Books.id) }}" {% if simple==false %}data-toggle="modal" data-target="#bookDetailsModal" data-remote="false"{% endif %}>
+          <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         </a>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             {% if loop.index > g.config_authors_max and g.config_authors_max != 0 %}
               {% if not loop.first %}
                 <span class="author-hidden-divider">&amp;</span>
@@ -61,17 +61,17 @@
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index|formatseriesindex}})
+          ({{entry.Books.series_index|formatseriesindex}})
         </p>
         {% endif %}
-        {% if entry.ratings.__len__() > 0 %}
+        {% if entry.Books.ratings.__len__() > 0 %}
         <div class="rating">
-          {% for number in range((entry.ratings[0].rating/2)|int(2)) %}
+          {% for number in range((entry.Books.ratings[0].rating/2)|int(2)) %}
             <span class="glyphicon glyphicon-star good"></span>
             {% if loop.last and loop.index < 5 %}
               {% for numer in range(5 - loop.index) %}
diff --git a/cps/templates/shelfdown.html b/cps/templates/shelfdown.html
index c800dca7..f1a0b137 100644
--- a/cps/templates/shelfdown.html
+++ b/cps/templates/shelfdown.html
@@ -35,31 +35,31 @@
     <div class="col-sm-3 col-lg-2 col-xs-6 book">
 
       <div class="meta">
-        <p title="{{entry.title}}" class="title">{{entry.title|shortentitle}}</p>
+        <p title="{{entry.Books.title}}" class="title">{{entry.Books.title|shortentitle}}</p>
         <p class="author">
-          {% for author in entry.ordered_authors %}
+          {% for author in entry.Books.authors %}
             <a href="{{url_for('web.books_list',  data='author', sort_param='stored', book_id=author.id) }}">{{author.name.replace('|',',')}}</a>
             {% if not loop.last %}
               &amp;
             {% endif %}
           {% endfor %}
         </p>
-        {% if entry.series.__len__() > 0 %}
+        {% if entry.Books.series.__len__() > 0 %}
         <p class="series">
-          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.series[0].id )}}">
-            {{entry.series[0].name}}
+          <a href="{{url_for('web.books_list', data='series', sort_param='stored', book_id=entry.Books.series[0].id )}}">
+            {{entry.Books.series[0].name}}
           </a>
-          ({{entry.series_index}})
+          ({{entry.Books.series_index}})
         </p>
         {% endif %}
       </div>
 
 	  <div class="btn-group" role="group" aria-label="Download, send to Kindle, reading">
           {% if g.user.role_download() %}
-            {% if entry.data|length %}
+            {% if entry.Books.data|length %}
             <div class="btn-group" role="group">
-                {% for format in entry.data %}
-                <a href="{{ url_for('web.download_link', book_id=entry.id, book_format=format.format|lower, anyname=entry.id|string+'.'+format.format|lower) }}" id="btnGroupDrop{{entry.id}}{{format.format|lower}}" class="btn btn-primary" role="button">
+                {% for format in entry.Books.data %}
+                <a href="{{ url_for('web.download_link', book_id=entry.Books.id, book_format=format.format|lower, anyname=entry.Books.id|string+'.'+format.format|lower) }}" id="btnGroupDrop{{entry.Books.id}}{{format.format|lower}}" class="btn btn-primary" role="button">
                   <span class="glyphicon glyphicon-download"></span>{{format.format}} ({{ format.uncompressed_size|filesizeformat }})
                 </a>
                 {% endfor %}
diff --git a/cps/web.py b/cps/web.py
index d21ba630..525fccbe 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -85,7 +85,10 @@ except ImportError:
 def add_security_headers(resp):
     csp = "default-src 'self'"
     csp += ''.join([' ' + host for host in config.config_trustedhosts.strip().split(',')])
-    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' data:"
+    csp += " 'unsafe-inline' 'unsafe-eval'; font-src 'self' data:; img-src 'self' "
+    if request.path.startswith("/author/") and config.config_use_goodreads:
+        csp += "images.gr-assets.com i.gr-assets.com s.gr-assets.com"
+    csp += " data:"
     resp.headers['Content-Security-Policy'] = csp
     if request.endpoint == "edit-book.show_edit_book" or config.config_use_google_drive:
         resp.headers['Content-Security-Policy'] += " *"
@@ -350,7 +353,7 @@ def render_books_list(data, sort_param, book_id, page):
     if data == "rated":
         return render_rated_books(page, book_id, order=order)
     elif data == "discover":
-        return render_discover_books(page, book_id)
+        return render_discover_books(book_id)
     elif data == "unread":
         return render_read_books(page, False, order=order)
     elif data == "read":
@@ -386,7 +389,7 @@ def render_books_list(data, sort_param, book_id, page):
     else:
         website = data or "newest"
         entries, random, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, order[0],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -400,7 +403,7 @@ def render_rated_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.ratings.any(db.Ratings.rating > 9),
                                                                 order[0],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -411,11 +414,13 @@ def render_rated_books(page, book_id, order):
         abort(404)
 
 
-def render_discover_books(page, book_id):
+def render_discover_books(book_id):
     if current_user.check_visibility(constants.SIDEBAR_RANDOM):
-        entries, __, pagination = calibre_db.fill_indexpage(page, 0, db.Books, True, [func.randomblob(2)])
+        entries, __, ___ = calibre_db.fill_indexpage(1, 0, db.Books, True, [func.randomblob(2)],
+                                                            join_archive_read=True,
+                                                            config_read_column=config.config_read_column)
         pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
-        return render_title_template('discover.html', entries=entries, pagination=pagination, id=book_id,
+        return render_title_template('index.html', random=false(), entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Discover (Random Books)"), page="discover")
     else:
         abort(404)
@@ -429,18 +434,22 @@ def render_hot_books(page, order):
             #        order[0][0].compare(func.count(ub.Downloads.book_id).asc())):
             order = [func.count(ub.Downloads.book_id).desc()], 'hotdesc'
         if current_user.show_detail_random():
-            random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
-                .order_by(func.random()).limit(config.config_random_books)
+            random_query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+            random = (random_query.filter(calibre_db.common_filters())
+                     .order_by(func.random())
+                     .limit(config.config_random_books).all())
         else:
             random = false()
+
         off = int(int(config.config_books_per_page) * (page - 1))
         all_books = ub.session.query(ub.Downloads, func.count(ub.Downloads.book_id)) \
             .order_by(*order[0]).group_by(ub.Downloads.book_id)
         hot_books = all_books.offset(off).limit(config.config_books_per_page)
         entries = list()
         for book in hot_books:
-            download_book = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()).filter(
-                db.Books.id == book.Downloads.book_id).first()
+            query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+            download_book = query.filter(calibre_db.common_filters()).filter(
+                book.Downloads.book_id == db.Books.id).first()
             if download_book:
                 entries.append(download_book)
             else:
@@ -459,26 +468,20 @@ def render_downloaded_books(page, order, user_id):
     else:
         user_id = current_user.id
     if current_user.check_visibility(constants.SIDEBAR_DOWNLOAD):
-        if current_user.show_detail_random():
-            random = calibre_db.session.query(db.Books).filter(calibre_db.common_filters()) \
-                .order_by(func.random()).limit(config.config_random_books)
-        else:
-            random = false()
-
-        entries, __, pagination = calibre_db.fill_indexpage(page,
+        entries, random, pagination = calibre_db.fill_indexpage(page,
                                                             0,
                                                             db.Books,
                                                             ub.Downloads.user_id == user_id,
                                                             order[0],
-                                                            False, 0,
+                                                            True, config.config_read_column,
                                                             db.books_series_link,
                                                             db.Books.id == db.books_series_link.c.book,
                                                             db.Series,
                                                             ub.Downloads, db.Books.id == ub.Downloads.book_id)
         for book in entries:
-            if not calibre_db.session.query(db.Books).\
-                                            filter(calibre_db.common_filters()).filter(db.Books.id == book.id).first():
-                ub.delete_download(book.id)
+            if not (calibre_db.session.query(db.Books).filter(calibre_db.common_filters())
+                    .filter(db.Books.id == book.Books.id).first()):
+                ub.delete_download(book.Books.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
         return render_title_template('index.html',
                                      random=random,
@@ -497,9 +500,9 @@ def render_author_books(page, author_id, order):
                                                         db.Books,
                                                         db.Books.authors.any(db.Authors.id == author_id),
                                                         [order[0][0], db.Series.name, db.Books.series_index],
-                                                        False, 0,
+                                                        True, config.config_read_column,
                                                         db.books_series_link,
-                                                        db.Books.id == db.books_series_link.c.book,
+                                                        db.books_series_link.c.book == db.Books.id,
                                                         db.Series)
     if entries is None or not len(entries):
         flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
@@ -515,7 +518,8 @@ def render_author_books(page, author_id, order):
     other_books = []
     if services.goodreads_support and config.config_use_goodreads:
         author_info = services.goodreads_support.get_author_info(author_name)
-        other_books = services.goodreads_support.get_other_books(author_info, entries)
+        book_entries = [entry.Books for entry in entries]
+        other_books = services.goodreads_support.get_other_books(author_info, book_entries)
     return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
                                  title=_(u"Author: %(name)s", name=author_name), author=author_info,
                                  other_books=other_books, page="author", order=order[1])
@@ -528,7 +532,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.publishers.any(db.Publishers.id == book_id),
                                                                 [db.Series.name, order[0][0], db.Books.series_index],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -546,7 +550,8 @@ def render_series_books(page, book_id, order):
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
-                                                                [order[0][0]])
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Series: %(serie)s", serie=name.name), page="series", order=order[1])
     else:
@@ -558,7 +563,8 @@ def render_ratings_books(page, book_id, order):
     entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                             db.Books,
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
-                                                            [order[0][0]])
+                                                            [order[0][0]],
+                                                            True, config.config_read_column)
     if name and name.rating <= 10:
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)),
@@ -574,7 +580,8 @@ def render_formats_books(page, book_id, order):
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
-                                                                [order[0][0]])
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"File format: %(format)s", format=name.format),
                                      page="formats",
@@ -590,7 +597,7 @@ def render_category_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.tags.any(db.Tags.id == book_id),
                                                                 [order[0][0], db.Series.name, db.Books.series_index],
-                                                                False, 0,
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
@@ -609,7 +616,8 @@ def render_language_books(page, name, order):
     entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
-                                                            [order[0][0]])
+                                                            [order[0][0]],
+                                                            True, config.config_read_column)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", order=order[1])
 
@@ -622,30 +630,12 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                              ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED)
         else:
             db_filter = coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED
-        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
-                                                                db.Books,
-                                                                db_filter,
-                                                                sort_param,
-                                                                False, 0,
-                                                                db.books_series_link,
-                                                                db.Books.id == db.books_series_link.c.book,
-                                                                db.Series,
-                                                                ub.ReadBook, db.Books.id == ub.ReadBook.book_id)
     else:
         try:
             if are_read:
                 db_filter = db.cc_classes[config.config_read_column].value == True
             else:
                 db_filter = coalesce(db.cc_classes[config.config_read_column].value, False) != True
-            entries, random, pagination = calibre_db.fill_indexpage(page, 0,
-                                                                    db.Books,
-                                                                    db_filter,
-                                                                    sort_param,
-                                                                    False, 0,
-                                                                    db.books_series_link,
-                                                                    db.Books.id == db.books_series_link.c.book,
-                                                                    db.Series,
-                                                                    db.cc_classes[config.config_read_column])
         except (KeyError, AttributeError, IndexError):
             log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             if not as_xml:
@@ -655,6 +645,15 @@ def render_read_books(page, are_read, as_xml=False, order=None):
                 return redirect(url_for("web.index"))
             return []  # ToDo: Handle error Case for opds
 
+    entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                            db.Books,
+                                                            db_filter,
+                                                            sort_param,
+                                                            True, config.config_read_column,
+                                                            db.books_series_link,
+                                                            db.Books.id == db.books_series_link.c.book,
+                                                            db.Series)
+
     if as_xml:
         return entries, pagination
     else:
@@ -683,7 +682,7 @@ def render_archived_books(page, sort_param):
                                                                                 archived_filter,
                                                                                 order,
                                                                                 True,
-                                                                                False, 0)
+                                                                                True, config.config_read_column)
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     page_name = "archived"
@@ -723,7 +722,7 @@ def render_prepare_search_form(cc):
 
 
 def render_search_results(term, offset=None, order=None, limit=None):
-    join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
+    join = db.books_series_link, db.books_series_link.c.book == db.Books.id, db.Series
     entries, result_count, pagination = calibre_db.get_search_results(term,
                                                                       offset,
                                                                       order,
@@ -813,27 +812,8 @@ def list_books():
             books = calibre_db.search_query(search_param, config.config_read_column).all()
             filtered_count = len(books)
         else:
-            if not config.config_read_column:
-                books = (calibre_db.session.query(db.Books, ub.ReadBook.read_status, ub.ArchivedBook.is_archived)
-                         .select_from(db.Books)
-                         .outerjoin(ub.ReadBook,
-                                    and_(ub.ReadBook.user_id == int(current_user.id),
-                                         ub.ReadBook.book_id == db.Books.id)))
-            else:
-                read_column = ""
-                try:
-                    read_column = db.cc_classes[config.config_read_column]
-                    books = (calibre_db.session.query(db.Books, read_column.value, ub.ArchivedBook.is_archived)
-                             .select_from(db.Books)
-                             .outerjoin(read_column, read_column.book == db.Books.id))
-                except (KeyError, AttributeError, IndexError):
-                    log.error(
-                        "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-                    # Skip linking read column and return None instead of read status
-                    books = calibre_db.session.query(db.Books, None, ub.ArchivedBook.is_archived)
-            books = (books.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                           int(current_user.id) == ub.ArchivedBook.user_id))
-                     .filter(calibre_db.common_filters(allow_show_archived=True)).all())
+            query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+            books = query.filter(calibre_db.common_filters(allow_show_archived=True)).all()
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
     elif search_param:
         entries, filtered_count, __ = calibre_db.get_search_results(search_param,
@@ -856,8 +836,8 @@ def list_books():
     result = list()
     for entry in entries:
         val = entry[0]
-        val.read_status = entry[1] == ub.ReadBook.STATUS_FINISHED
-        val.is_archived = entry[2] is True
+        val.is_archived = entry[1] is True
+        val.read_status = entry[2] == ub.ReadBook.STATUS_FINISHED
         for lang_index in range(0, len(val.languages)):
             val.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), val.languages[
                 lang_index].lang_code)
@@ -1254,24 +1234,25 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 
     cc = get_cc_columns(filter_config_custom_read=True)
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
-    if not config.config_read_column:
+    query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
+    '''if not config.config_read_column:
         query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
                  .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
                                               int(current_user.id) == ub.ReadBook.user_id)))
     else:
         try:
-            read_column = cc[config.config_read_column]
+            read_column = db.cc_classes[config.config_read_column]
             query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
-                     .select_from(db.Books)
-                     .outerjoin(read_column, read_column.book == db.Books.id))
+                    .select_from(db.Books)
+                    .outerjoin(read_column, read_column.book == db.Books.id))
         except (KeyError, AttributeError, IndexError):
             log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
             # Skip linking read column
             query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
     query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                  int(current_user.id) == ub.ArchivedBook.user_id))
+                                                  int(current_user.id) == ub.ArchivedBook.user_id))'''
 
-    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book) \
+    q = query.outerjoin(db.books_series_link, db.books_series_link.c.book == db.Books.id) \
         .outerjoin(db.Series) \
         .filter(calibre_db.common_filters(True))
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 7be8da35..4427548a 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-03-19 22:04:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-26 21:40:01</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>2022-03-20 02:50:09</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-27 04:18:33</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>3h 58 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 50 min</p>
         </div>
       </div>
       </div>
@@ -891,11 +891,11 @@
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooks</td>
         <td class="text-center">36</td>
-        <td class="text-center">35</td>
-        <td class="text-center">0</td>
+        <td class="text-center">34</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -1237,11 +1237,31 @@
     
     
     
-        <tr id='pt11.36' class='hiddenRow bg-success'>
+        <tr id="ft11.36" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</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_ft11.36')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft11.36" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft11.36').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 799, in test_upload_cover_hdd
+    self.assertFalse(self.check_element_on_page((By.CLASS_NAME, &#34;alert&#34;)))
+AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;53d4d98b-a28b-426d-b0d6-c6ad1500540a&#34;, element=&#34;e0d0a1a6-960e-41c3-9639-bbda2c2be4d5&#34;)&gt; is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1589,8 +1609,8 @@
     <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">20</td>
-        <td class="text-center">16</td>
-        <td class="text-center">4</td>
+        <td class="text-center">18</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1735,31 +1755,11 @@
     
     
     
-        <tr id="ft16.16" class="none bg-danger">
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 145, in test_edit_title
-    self.assertTrue(self.check_element_on_page((By.ID, &#39;flash_success&#39;)))
-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>
     
     
@@ -1833,31 +1833,11 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
-        <tr id="ft16.20" class="none bg-danger">
+        <tr id='pt16.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.20')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.20" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.20').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 937, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5?edit=34e51cc2-2413-4a23-8324-26d568a421ba&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2031,11 +2011,11 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestErrorReadColumn</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -2054,11 +2034,87 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id="ft21.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</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_ft21.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft21.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft21.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 46, in test_invalid_custom_read_column
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c22', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et22.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_error_read_column)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et22.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 33, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2072,13 +2128,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2087,19 +2143,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st22.2" class="none bg-warning">
+        <tr id="st23.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.2" 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_st22.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st23.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2113,7 +2169,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2131,13 +2187,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 1)">Detail</a>
+            <a onclick="showClassDetail('c24', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2147,43 +2203,113 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestGoodreads</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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 3)">Detail</a>
+            <a onclick="showClassDetail('c25', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id="ft25.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</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_ft25.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 96, in test_author_page
+    self.assertTrue(self.check_element_on_page((By.CLASS_NAME, &#34;author-photo&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id="et25.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</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_et25.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 61, in test_author_page_invalid
+    self.fill_basic_config({&#39;config_goodreads_api_key&#39;: &#39;rgg&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id="ft25.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</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_ft25.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 113, in test_goodreads_about
+    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2197,13 +2323,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2212,7 +2338,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2221,7 +2347,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2230,7 +2356,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2239,7 +2365,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2248,7 +2374,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2257,7 +2383,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2266,7 +2392,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2275,7 +2401,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2284,7 +2410,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2293,7 +2419,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2311,13 +2437,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
+            <a onclick="showClassDetail('c27', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2326,7 +2452,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2335,7 +2461,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2344,7 +2470,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2353,7 +2479,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2371,13 +2497,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 13)">Detail</a>
+            <a onclick="showClassDetail('c28', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2386,7 +2512,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2395,7 +2521,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2404,7 +2530,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2413,7 +2539,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2422,7 +2548,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2431,7 +2557,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2440,7 +2566,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2449,7 +2575,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2458,7 +2584,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2467,7 +2593,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2476,7 +2602,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2485,7 +2611,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2495,21 +2621,21 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCalibreWebListOrders</td>
+        <td class="text-center">10</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">1</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 8)">Detail</a>
+            <a onclick="showClassDetail('c29', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2518,7 +2644,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2527,7 +2653,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2536,7 +2662,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2545,7 +2671,67 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id="ft29.5" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 394, in test_order_authors_all_links
+    self.assertEqual(books[1][0][&#39;title&#39;], &#34;testbook&#34;)
+AssertionError: &#39;Very long extra super turbo cool title without any issue of ...&#39; != &#39;testbook&#39;
+- Very long extra super turbo cool title without any issue of ...
++ testbook</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et29.6" class="none bg-info">
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et29.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et29.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et29.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 382, in test_order_series_all_links
+    author_books[1][0][&#39;series_ele&#39;].click()
+KeyError: &#39;series_ele&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2554,7 +2740,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2563,7 +2749,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2572,7 +2758,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2590,13 +2776,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 9)">Detail</a>
+            <a onclick="showClassDetail('c30', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2605,7 +2791,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2614,7 +2800,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2623,7 +2809,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2632,19 +2818,19 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id="st29.5" class="none bg-warning">
+        <tr id="st30.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st29.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st30.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_st29.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st30.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2658,7 +2844,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2667,7 +2853,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2676,7 +2862,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2685,7 +2871,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2703,13 +2889,13 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c31', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2718,7 +2904,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2727,7 +2913,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2736,7 +2922,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2745,7 +2931,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2754,7 +2940,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2763,7 +2949,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2772,7 +2958,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2781,7 +2967,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2790,7 +2976,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2799,7 +2985,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2808,7 +2994,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2817,7 +3003,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2826,7 +3012,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2835,7 +3021,7 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2845,72 +3031,8 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c31', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et31.1" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_merge_books_list)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et31.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et31.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et31.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 24, in setUpClass
-    startup(cls, cls.py_version, {&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_func.py&#34;, line 175, in startup
-    inst.driver = webdriver.Firefox()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/firefox/webdriver.py&#34;, line 178, in __init__
-    RemoteWebDriver.__init__(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 269, in __init__
-    self.start_session(capabilities, browser_profile)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 360, in start_session
-    response = self.execute(Command.NEW_SESSION, parameters)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.WebDriverException: Message: Process unexpectedly closed with status 0
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_merge_books_list.py&#34;, line 28, in setUpClass
-    cls.driver.quit()
-AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
     <tr id="su" class="passClass">
-        <td>TestOAuthLogin</td>
+        <td>TestMergeBooksList</td>
         <td class="text-center">2</td>
         <td class="text-center">2</td>
         <td class="text-center">0</td>
@@ -2925,7 +3047,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
         <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
+                <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -2933,6 +3055,39 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
         <tr id='pt32.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestMergeBooksList - test_delete_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestOAuthLogin</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">
+            <a onclick="showClassDetail('c33', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt33.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2950,13 +3105,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 23)">Detail</a>
+            <a onclick="showClassDetail('c34', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2965,7 +3120,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2974,7 +3129,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2983,7 +3138,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2992,7 +3147,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3001,7 +3156,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3010,7 +3165,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3019,7 +3174,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3028,7 +3183,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3037,7 +3192,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3046,7 +3201,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.11' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3055,7 +3210,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3064,7 +3219,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3073,7 +3228,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.14' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3082,7 +3237,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id='pt34.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3091,7 +3246,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.16' class='hiddenRow bg-success'>
+        <tr id='pt34.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3100,7 +3255,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id='pt34.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3109,7 +3264,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id='pt34.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3118,7 +3273,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.19' class='hiddenRow bg-success'>
+        <tr id='pt34.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3127,7 +3282,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id='pt34.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3136,7 +3291,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.21' class='hiddenRow bg-success'>
+        <tr id='pt34.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3145,7 +3300,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.22' class='hiddenRow bg-success'>
+        <tr id='pt34.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3154,7 +3309,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt33.23' class='hiddenRow bg-success'>
+        <tr id='pt34.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3172,13 +3327,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3196,13 +3351,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3211,7 +3366,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3220,7 +3375,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3229,7 +3384,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3238,7 +3393,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3256,13 +3411,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3280,13 +3435,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3304,13 +3459,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3319,7 +3474,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3328,7 +3483,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3337,7 +3492,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3346,7 +3501,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3355,7 +3510,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3364,7 +3519,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3373,7 +3528,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3391,13 +3546,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3406,7 +3561,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3415,7 +3570,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3433,13 +3588,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3448,7 +3603,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3457,7 +3612,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3466,7 +3621,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3475,7 +3630,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3484,7 +3639,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3493,7 +3648,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3502,7 +3657,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3511,7 +3666,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3520,7 +3675,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3529,7 +3684,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3538,7 +3693,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3547,7 +3702,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3556,19 +3711,19 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st41.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.14" 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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3582,7 +3737,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3591,7 +3746,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3609,13 +3764,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 9)">Detail</a>
+            <a onclick="showClassDetail('c42', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3624,7 +3779,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3633,7 +3788,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3642,7 +3797,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3651,7 +3806,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3660,7 +3815,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3669,19 +3824,19 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id="st41.7" class="none bg-warning">
+        <tr id="st42.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st41.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3695,7 +3850,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3704,7 +3859,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3722,13 +3877,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 4)">Detail</a>
+            <a onclick="showClassDetail('c43', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3737,7 +3892,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3746,7 +3901,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3755,7 +3910,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3773,13 +3928,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 18)">Detail</a>
+            <a onclick="showClassDetail('c44', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3788,7 +3943,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3797,7 +3952,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3806,7 +3961,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3815,7 +3970,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3824,7 +3979,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3833,7 +3988,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3842,7 +3997,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3851,7 +4006,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3860,7 +4015,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3869,7 +4024,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3878,7 +4033,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3887,7 +4042,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3896,7 +4051,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3905,7 +4060,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3914,7 +4069,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3923,7 +4078,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3932,7 +4087,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3950,13 +4105,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 1)">Detail</a>
+            <a onclick="showClassDetail('c45', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3974,13 +4129,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 21)">Detail</a>
+            <a onclick="showClassDetail('c46', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3989,7 +4144,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3998,7 +4153,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4007,7 +4162,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4016,7 +4171,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4025,7 +4180,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4034,7 +4189,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4043,7 +4198,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4052,7 +4207,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4061,7 +4216,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4070,7 +4225,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4079,7 +4234,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4088,7 +4243,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4097,7 +4252,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4106,7 +4261,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4115,7 +4270,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4124,7 +4279,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4133,7 +4288,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4142,7 +4297,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4151,7 +4306,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4160,7 +4315,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4170,21 +4325,21 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">34</td>
-        <td class="text-center">34</td>
-        <td class="text-center">0</td>
+        <td class="text-center">35</td>
+        <td class="text-center">33</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('c46', 34)">Detail</a>
+            <a onclick="showClassDetail('c47', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4193,7 +4348,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4202,7 +4357,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4211,7 +4366,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4220,7 +4375,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4229,7 +4384,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4238,7 +4393,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4247,7 +4402,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4256,7 +4411,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4265,7 +4420,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4274,7 +4429,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4283,7 +4438,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4292,7 +4447,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4301,7 +4456,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4310,7 +4465,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4319,7 +4474,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4328,7 +4483,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4337,7 +4492,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4346,7 +4501,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4355,7 +4510,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4364,7 +4519,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4373,7 +4528,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.22' class='hiddenRow bg-success'>
+        <tr id='pt47.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4382,7 +4537,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.23' class='hiddenRow bg-success'>
+        <tr id='pt47.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4391,16 +4546,36 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.24' class='hiddenRow bg-success'>
+        <tr id="ft47.24" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</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_ft47.24')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft47.24" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft47.24').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 814, in test_link_column_to_read_status
+    self.assertTrue(author[1][0][&#39;read&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.25' class='hiddenRow bg-success'>
+        <tr id='pt47.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4409,7 +4584,36 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.26' class='hiddenRow bg-success'>
+        <tr id="ft47.26" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft47.26')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft47.26" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft47.26').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 898, in test_read_status_visible
+    self.assertEqual(len(list_element[1]), 1)
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt47.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4418,7 +4622,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.27' class='hiddenRow bg-success'>
+        <tr id='pt47.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4427,7 +4631,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.28' class='hiddenRow bg-success'>
+        <tr id='pt47.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4436,7 +4640,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.29' class='hiddenRow bg-success'>
+        <tr id='pt47.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4445,7 +4649,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.30' class='hiddenRow bg-success'>
+        <tr id='pt47.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4454,7 +4658,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.31' class='hiddenRow bg-success'>
+        <tr id='pt47.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4463,7 +4667,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.32' class='hiddenRow bg-success'>
+        <tr id='pt47.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4472,7 +4676,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.33' class='hiddenRow bg-success'>
+        <tr id='pt47.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4481,7 +4685,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt46.34' class='hiddenRow bg-success'>
+        <tr id='pt47.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4499,13 +4703,13 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 16)">Detail</a>
+            <a onclick="showClassDetail('c48', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4514,7 +4718,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4523,7 +4727,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4532,7 +4736,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4541,7 +4745,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4550,7 +4754,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4559,7 +4763,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4568,7 +4772,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4577,7 +4781,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4586,7 +4790,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4595,7 +4799,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4604,7 +4808,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4613,7 +4817,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4622,7 +4826,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4631,7 +4835,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4640,7 +4844,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4651,10 +4855,10 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>404</td>
-        <td>393</td>
-        <td>4</td>
-        <td>1</td>
+        <td>409</td>
+        <td>391</td>
+        <td>9</td>
+        <td>3</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4683,7 +4887,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-35-generic #40~20.04.1-Ubuntu SMP Mon Mar 7 09:18:32 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-37-generic #42~20.04.1-Ubuntu SMP Tue Mar 15 15:44:28 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4761,7 +4965,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>3.0.3</td>
+              <td>3.1.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4785,7 +4989,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>pytz</th>
-              <td>2021.3</td>
+              <td>2022.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4827,7 +5031,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4857,7 +5061,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4887,7 +5091,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4929,7 +5133,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4965,7 +5169,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5007,7 +5211,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.41.0</td>
+              <td>2.42.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5097,7 +5301,7 @@ AttributeError: &#39;NoneType&#39; object has no attribute &#39;quit&#39;</pre>
 </div>
 
 <script>
-    drawCircle(393, 4, 1, 6);
+    drawCircle(391, 9, 3, 6);
     showCase(5);
 </script>
 

From 2f949ce1dda03d4c65016547489c79a9e415be01 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 27 Mar 2022 14:07:58 +0200
Subject: [PATCH 169/220] Enabled search for text based custom column content
 in simple search (fix for #2279)

---
 cps/db.py     | 75 +++++++++++++++++++++++++++------------------------
 cps/helper.py | 18 -------------
 cps/opds.py   |  2 +-
 cps/web.py    | 39 ++++++++-------------------
 4 files changed, 52 insertions(+), 82 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 3b193e1a..3f64fbb5 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -819,38 +819,21 @@ class CalibreDB:
     def check_exists_book(self, authr, title):
         self.session.connection().connection.connection.create_function("lower", 1, lcase)
         q = list()
-        authorterms = re.split(r'\s*&\s*', authr)
-        for authorterm in authorterms:
-            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
+        author_terms = re.split(r'\s*&\s*', authr)
+        for author_term in author_terms:
+            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + author_term + "%")))
 
         return self.session.query(Books) \
             .filter(and_(Books.authors.any(and_(*q)), func.lower(Books.title).ilike("%" + title + "%"))).first()
 
-    def search_query(self, term, config_read_column, *join):
+    def search_query(self, term, config, *join):
         term.strip().lower()
         self.session.connection().connection.connection.create_function("lower", 1, lcase)
         q = list()
-        authorterms = re.split("[, ]+", term)
-        for authorterm in authorterms:
-            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + authorterm + "%")))
-        query = self.generate_linked_query(config_read_column, Books)
-        '''if not config_read_column:
-            query = (self.session.query(Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(Books)
-                     .outerjoin(ub.ReadBook, and_(Books.id == ub.ReadBook.book_id,
-                                                  int(current_user.id) == ub.ReadBook.user_id)))
-        else:
-            try:
-                read_column = cc_classes[config_read_column]
-                query = (self.session.query(Books, ub.ArchivedBook.is_archived, read_column.value)
-                         .select_from(Books)
-                         .outerjoin(read_column, read_column.book == Books.id))
-            except (KeyError, AttributeError, IndexError):
-                log.error("Custom Column No.{} is not existing in calibre database".format(config_read_column))
-                # Skip linking read column
-                query = self.session.query(Books, ub.ArchivedBook.is_archived, None)
-        query = query.outerjoin(ub.ArchivedBook, and_(Books.id == ub.ArchivedBook.book_id,
-                                                      int(current_user.id) == ub.ArchivedBook.user_id))'''
-
+        author_terms = re.split("[, ]+", term)
+        for author_term in author_terms:
+            q.append(Books.authors.any(func.lower(Authors.name).ilike("%" + author_term + "%")))
+        query = self.generate_linked_query(config.config_read_column, Books)
         if len(join) == 6:
             query = query.outerjoin(join[0], join[1]).outerjoin(join[2]).outerjoin(join[3], join[4]).outerjoin(join[5])
         if len(join) == 3:
@@ -859,20 +842,42 @@ class CalibreDB:
             query = query.outerjoin(join[0], join[1])
         elif len(join) == 1:
             query = query.outerjoin(join[0])
-        return query.filter(self.common_filters(True)).filter(
-            or_(Books.tags.any(func.lower(Tags.name).ilike("%" + term + "%")),
-                Books.series.any(func.lower(Series.name).ilike("%" + term + "%")),
-                Books.authors.any(and_(*q)),
-                Books.publishers.any(func.lower(Publishers.name).ilike("%" + term + "%")),
-                func.lower(Books.title).ilike("%" + term + "%")
-                ))
+
+        cc = self.get_cc_columns(config, filter_config_custom_read=True)
+        filter_expression = [Books.tags.any(func.lower(Tags.name).ilike("%" + term + "%")),
+                             Books.series.any(func.lower(Series.name).ilike("%" + term + "%")),
+                             Books.authors.any(and_(*q)),
+                             Books.publishers.any(func.lower(Publishers.name).ilike("%" + term + "%")),
+                             func.lower(Books.title).ilike("%" + term + "%")]
+        for c in cc:
+            if c.datatype not in ["datetime", "rating", "bool", "int", "float"]:
+                filter_expression.append(
+                    getattr(Books,
+                            'custom_column_' + str(c.id)).any(
+                        func.lower(cc_classes[c.id].value).ilike("%" + term + "%")))
+        return query.filter(self.common_filters(True)).filter(or_(*filter_expression))
+
+    def get_cc_columns(self, config, filter_config_custom_read=False):
+        tmp_cc = self.session.query(CustomColumns).filter(CustomColumns.datatype.notin_(cc_exceptions)).all()
+        cc = []
+        r = None
+        if config.config_columns_to_ignore:
+            r = re.compile(config.config_columns_to_ignore)
+
+        for col in tmp_cc:
+            if filter_config_custom_read and config.config_read_column and config.config_read_column == col.id:
+                continue
+            if r and r.match(col.name):
+                continue
+            cc.append(col)
+
+        return cc
 
     # read search results from calibre-database and return it (function is used for feed and simple search
-    def get_search_results(self, term, offset=None, order=None, limit=None,
-                           config_read_column=False, *join):
+    def get_search_results(self, term, config, offset=None, order=None, limit=None, *join):
         order = order[0] if order else [Books.sort]
         pagination = None
-        result = self.search_query(term, config_read_column, *join).order_by(*order).all()
+        result = self.search_query(term, config, *join).order_by(*order).all()
         result_count = len(result)
         if offset != None and limit != None:
             offset = int(offset)
diff --git a/cps/helper.py b/cps/helper.py
index 3a2276e9..765cf22b 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -953,24 +953,6 @@ def check_valid_domain(domain_text):
     return not len(result)
 
 
-def get_cc_columns(filter_config_custom_read=False):
-    tmpcc = calibre_db.session.query(db.CustomColumns)\
-        .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).all()
-    cc = []
-    r = None
-    if config.config_columns_to_ignore:
-        r = re.compile(config.config_columns_to_ignore)
-
-    for col in tmpcc:
-        if filter_config_custom_read and config.config_read_column and config.config_read_column == col.id:
-            continue
-        if r and r.match(col.name):
-            continue
-        cc.append(col)
-
-    return cc
-
-
 def get_download_link(book_id, book_format, client):
     book_format = book_format.split(".")[0]
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
diff --git a/cps/opds.py b/cps/opds.py
index 702ffe1e..8907f628 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -467,7 +467,7 @@ def feed_unread_books():
 
 def feed_search(term):
     if term:
-        entries, __, ___ = calibre_db.get_search_results(term, config_read_column=config.config_read_column)
+        entries, __, ___ = calibre_db.get_search_results(term, config=config)
         entries_count = len(entries) if len(entries) > 0 else 1
         pagination = Pagination(1, entries_count, entries_count)
         return render_xml_template('feed.xml', searchterm=term, entries=entries, pagination=pagination)
diff --git a/cps/web.py b/cps/web.py
index 525fccbe..e8bf48e3 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -50,7 +50,7 @@ from . import babel, db, ub, config, get_locale, app
 from . import calibre_db, kobo_sync_status
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
 from .helper import check_valid_domain, render_task_status, check_email, check_username, \
-    get_cc_columns, get_book_cover, get_download_link, send_mail, generate_random_password, \
+    get_book_cover, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email, \
     edit_book_read_status
 from .pagination import Pagination
@@ -724,10 +724,10 @@ def render_prepare_search_form(cc):
 def render_search_results(term, offset=None, order=None, limit=None):
     join = db.books_series_link, db.books_series_link.c.book == db.Books.id, db.Series
     entries, result_count, pagination = calibre_db.get_search_results(term,
+                                                                      config,
                                                                       offset,
                                                                       order,
                                                                       limit,
-                                                                      config.config_read_column,
                                                                       *join)
     return render_title_template('search.html',
                                  searchterm=term,
@@ -765,7 +765,7 @@ def books_list(data, sort_param, book_id, page):
 @login_required
 def books_table():
     visibility = current_user.view_settings.get('table', {})
-    cc = get_cc_columns(filter_config_custom_read=True)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     return render_title_template('book_table.html', title=_(u"Books List"), cc=cc, page="book_table",
                                  visiblility=visibility)
 
@@ -809,7 +809,7 @@ def list_books():
         calibre_db.common_filters(allow_show_archived=True)).count()
     if state is not None:
         if search_param:
-            books = calibre_db.search_query(search_param, config.config_read_column).all()
+            books = calibre_db.search_query(search_param, config).all()
             filtered_count = len(books)
         else:
             query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
@@ -817,10 +817,10 @@ def list_books():
         entries = calibre_db.get_checkbox_sorted(books, state, off, limit, order, True)
     elif search_param:
         entries, filtered_count, __ = calibre_db.get_search_results(search_param,
+                                                                    config,
                                                                     off,
                                                                     [order, ''],
                                                                     limit,
-                                                                    config.config_read_column,
                                                                     *join)
     else:
         entries, __, __ = calibre_db.fill_indexpage_with_archived_books((int(off) / (int(limit)) + 1),
@@ -1232,26 +1232,9 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
     sort_param = order[0] if order else [db.Books.sort]
     pagination = None
 
-    cc = get_cc_columns(filter_config_custom_read=True)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
     query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
-    '''if not config.config_read_column:
-        query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
-                 .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
-                                              int(current_user.id) == ub.ReadBook.user_id)))
-    else:
-        try:
-            read_column = db.cc_classes[config.config_read_column]
-            query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
-                    .select_from(db.Books)
-                    .outerjoin(read_column, read_column.book == db.Books.id))
-        except (KeyError, AttributeError, IndexError):
-            log.error("Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-            # Skip linking read column
-            query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
-    query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                  int(current_user.id) == ub.ArchivedBook.user_id))'''
-
     q = query.outerjoin(db.books_series_link, db.books_series_link.c.book == db.Books.id) \
         .outerjoin(db.Series) \
         .filter(calibre_db.common_filters(True))
@@ -1338,7 +1321,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         if description:
             q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
 
-        # search custom culumns
+        # search custom columns
         try:
             q = adv_search_custom_columns(cc, term, q)
         except AttributeError as ex:
@@ -1370,7 +1353,7 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
 @login_required_if_no_ano
 def advanced_search_form():
     # Build custom columns names
-    cc = get_cc_columns(filter_config_custom_read=True)
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
     return render_prepare_search_form(cc)
 
 
@@ -1757,10 +1740,10 @@ def show_book(book_id):
         for lang_index in range(0, len(entry.languages)):
             entry.languages[lang_index].language_name = isoLanguages.get_language_name(get_locale(), entry.languages[
                 lang_index].lang_code)
-        cc = get_cc_columns(filter_config_custom_read=True)
+        cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
         book_in_shelves = []
-        shelfs = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
-        for sh in shelfs:
+        shelves = ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).all()
+        for sh in shelves:
             book_in_shelves.append(sh.shelf)
 
         entry.tags = sort(entry.tags, key=lambda tag: tag.name)

From baffe1f5377cd2d6bf1a53b59eef1f7aadda0f9a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 28 Mar 2022 13:58:41 +0200
Subject: [PATCH 170/220] Plus ("+" vs. "%2B") encoded search strings for opds
 search feeds are now working in request string (fix for #2175)

---
 cps/gevent_wsgi.py                      |  29 +
 cps/opds.py                             |   2 +-
 cps/server.py                           |  10 +-
 cps/tornado_wsgi.py                     |  94 +++
 test/Calibre-Web TestSummary_Linux.html | 938 ++++++++----------------
 5 files changed, 445 insertions(+), 628 deletions(-)
 create mode 100644 cps/gevent_wsgi.py
 create mode 100644 cps/tornado_wsgi.py

diff --git a/cps/gevent_wsgi.py b/cps/gevent_wsgi.py
new file mode 100644
index 00000000..b044f31b
--- /dev/null
+++ b/cps/gevent_wsgi.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+from gevent.pywsgi import WSGIHandler
+
+class MyWSGIHandler(WSGIHandler):
+    def get_environ(self):
+        env = super().get_environ()
+        path, __ = self.path.split('?', 1) if '?' in self.path else (self.path, '')
+        env['RAW_URI'] = path
+        return env
+
+
diff --git a/cps/opds.py b/cps/opds.py
index 8907f628..cb8f397e 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -85,7 +85,7 @@ def feed_osd():
 @requires_basic_auth_if_no_ano
 def feed_cc_search(query):
     # Handle strange query from Libera Reader with + instead of spaces
-    plus_query = unquote_plus(request.base_url.split('/opds/search/')[1]).strip()
+    plus_query = unquote_plus(request.environ['RAW_URI'].split('/opds/search/')[1]).strip()
     return feed_search(plus_query)
 
 
diff --git a/cps/server.py b/cps/server.py
index e261c50a..0ffdbd18 100644
--- a/cps/server.py
+++ b/cps/server.py
@@ -25,6 +25,7 @@ import subprocess  # nosec
 
 try:
     from gevent.pywsgi import WSGIServer
+    from .gevent_wsgi import MyWSGIHandler
     from gevent.pool import Pool
     from gevent import __version__ as _version
     from greenlet import GreenletExit
@@ -32,7 +33,7 @@ try:
     VERSION = 'Gevent ' + _version
     _GEVENT = True
 except ImportError:
-    from tornado.wsgi import WSGIContainer
+    from .tornado_wsgi import MyWSGIContainer
     from tornado.httpserver import HTTPServer
     from tornado.ioloop import IOLoop
     from tornado import version as _version
@@ -202,7 +203,8 @@ class WebServer(object):
             if output is None:
                 output = _readable_listen_address(self.listen_address, self.listen_port)
             log.info('Starting Gevent server on %s', output)
-            self.wsgiserver = WSGIServer(sock, self.app, log=self.access_logger, spawn=Pool(), **ssl_args)
+            self.wsgiserver = WSGIServer(sock, self.app, log=self.access_logger, handler_class=MyWSGIHandler,
+                                         spawn=Pool(), **ssl_args)
             if ssl_args:
                 wrap_socket = self.wsgiserver.wrap_socket
                 def my_wrap_socket(*args, **kwargs):
@@ -225,8 +227,8 @@ class WebServer(object):
             asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
         log.info('Starting Tornado server on %s', _readable_listen_address(self.listen_address, self.listen_port))
 
-        # Max Buffersize set to 200MB            )
-        http_server = HTTPServer(WSGIContainer(self.app),
+        # Max Buffersize set to 200MB
+        http_server = HTTPServer(MyWSGIContainer(self.app),
                                  max_buffer_size=209700000,
                                  ssl_options=self.ssl_args)
         http_server.listen(self.listen_port, self.listen_address)
diff --git a/cps/tornado_wsgi.py b/cps/tornado_wsgi.py
new file mode 100644
index 00000000..af93219c
--- /dev/null
+++ b/cps/tornado_wsgi.py
@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+from tornado.wsgi import WSGIContainer
+import tornado
+
+from tornado import escape
+from tornado import httputil
+
+from typing import List, Tuple, Optional, Callable, Any, Dict, Text
+from types import TracebackType
+import typing
+
+if typing.TYPE_CHECKING:
+    from typing import Type  # noqa: F401
+    from wsgiref.types import WSGIApplication as WSGIAppType  # noqa: F4
+
+class MyWSGIContainer(WSGIContainer):
+
+    def __call__(self, request: httputil.HTTPServerRequest) -> None:
+        data = {}  # type: Dict[str, Any]
+        response = []  # type: List[bytes]
+
+        def start_response(
+            status: str,
+            headers: List[Tuple[str, str]],
+            exc_info: Optional[
+                Tuple[
+                    "Optional[Type[BaseException]]",
+                    Optional[BaseException],
+                    Optional[TracebackType],
+                ]
+            ] = None,
+        ) -> Callable[[bytes], Any]:
+            data["status"] = status
+            data["headers"] = headers
+            return response.append
+
+        app_response = self.wsgi_application(
+            MyWSGIContainer.environ(request), start_response
+        )
+        try:
+            response.extend(app_response)
+            body = b"".join(response)
+        finally:
+            if hasattr(app_response, "close"):
+                app_response.close()  # type: ignore
+        if not data:
+            raise Exception("WSGI app did not call start_response")
+
+        status_code_str, reason = data["status"].split(" ", 1)
+        status_code = int(status_code_str)
+        headers = data["headers"]  # type: List[Tuple[str, str]]
+        header_set = set(k.lower() for (k, v) in headers)
+        body = escape.utf8(body)
+        if status_code != 304:
+            if "content-length" not in header_set:
+                headers.append(("Content-Length", str(len(body))))
+            if "content-type" not in header_set:
+                headers.append(("Content-Type", "text/html; charset=UTF-8"))
+        if "server" not in header_set:
+            headers.append(("Server", "TornadoServer/%s" % tornado.version))
+
+        start_line = httputil.ResponseStartLine("HTTP/1.1", status_code, reason)
+        header_obj = httputil.HTTPHeaders()
+        for key, value in headers:
+            header_obj.add(key, value)
+        assert request.connection is not None
+        request.connection.write_headers(start_line, header_obj, chunk=body)
+        request.connection.finish()
+        self._log(status_code, request)
+
+    @staticmethod
+    def environ(request: httputil.HTTPServerRequest) -> Dict[Text, Any]:
+        environ = WSGIContainer.environ(request)
+        environ['RAW_URI'] = request.path
+        return environ
+
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 4427548a..54fda2b1 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-03-26 21:40:01</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-28 06:40:49</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>2022-03-27 04:18:33</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-28 12:18: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>Duration: </strong>4h 50 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 46 min</p>
         </div>
       </div>
       </div>
@@ -891,11 +891,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestEditBooks</td>
         <td class="text-center">36</td>
-        <td class="text-center">34</td>
-        <td class="text-center">1</td>
+        <td class="text-center">35</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -1237,31 +1237,11 @@
     
     
     
-        <tr id="ft11.36" class="none bg-danger">
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft11.36')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft11.36" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft11.36').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books.py&#34;, line 799, in test_upload_cover_hdd
-    self.assertFalse(self.check_element_on_page((By.CLASS_NAME, &#34;alert&#34;)))
-AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#34;53d4d98b-a28b-426d-b0d6-c6ad1500540a&#34;, element=&#34;e0d0a1a6-960e-41c3-9639-bbda2c2be4d5&#34;)&gt; is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1606,15 +1586,15 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
         <td class="text-center">18</td>
-        <td class="text-center">2</td>
+        <td class="text-center">18</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('c16', 20)">Detail</a>
+            <a onclick="showClassDetail('c16', 18)">Detail</a>
         </td>
     </tr>
 
@@ -1764,38 +1744,7 @@ AssertionError: &lt;selenium.webdriver.remote.webelement.WebElement (session=&#3
     
     
     
-        <tr id="ft16.17" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 855, in test_upload_book_epub
-    self.assertEqual(&#39;8936&#39;, resp.headers[&#39;Content-Length&#39;])
-AssertionError: &#39;8936&#39; != &#39;1103&#39;
-- 8936
-+ 1103</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1804,36 +1753,7 @@ AssertionError: &#39;8936&#39; != &#39;1103&#39;
     
     
     
-        <tr id="ft16.19" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.19')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.19" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.19').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 768, in test_upload_cover_hdd
-    self.assertGreater(diff(&#39;original.png&#39;, &#39;jpeg.png&#39;, delete_diff_file=True), 0.02)
-AssertionError: 0.0 not greater than 0.02</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.20' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2011,11 +1931,11 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestErrorReadColumn</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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">
@@ -2034,87 +1954,11 @@ AssertionError: 0.0 not greater than 0.02</pre>
     
     
     
-        <tr id="ft21.2" class="none bg-danger">
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft21.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft21.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft21.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 46, in test_invalid_custom_read_column
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_danger&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c22', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et22.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_error_read_column)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et22.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et22.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et22.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_error_read_column.py&#34;, line 33, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2128,13 +1972,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2143,19 +1987,19 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.2" 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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2169,7 +2013,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2187,13 +2031,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2203,113 +2047,43 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestGoodreads</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">2</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft25.1" class="none bg-danger">
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 96, in test_author_page
-    self.assertTrue(self.check_element_on_page((By.CLASS_NAME, &#34;author-photo&#34;)))
-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>
     
     
     
-        <tr id="et25.2" class="none bg-info">
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 61, in test_author_page_invalid
-    self.fill_basic_config({&#39;config_goodreads_api_key&#39;: &#39;rgg&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 358, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 268, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft25.3" class="none bg-danger">
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_goodreads.py&#34;, line 113, in test_goodreads_about
-    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
-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>
     
     
@@ -2323,13 +2097,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2338,7 +2112,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2347,7 +2121,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2356,7 +2130,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2365,7 +2139,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2374,7 +2148,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2383,7 +2157,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2392,7 +2166,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2401,7 +2175,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2410,7 +2184,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2419,7 +2193,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2437,13 +2211,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 5)">Detail</a>
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2452,7 +2226,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2461,7 +2235,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2470,7 +2244,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2479,7 +2253,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2497,13 +2271,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2512,7 +2286,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2521,7 +2295,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2530,7 +2304,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2539,7 +2313,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2548,7 +2322,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2557,7 +2331,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2566,7 +2340,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2575,7 +2349,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2584,7 +2358,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2593,7 +2367,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2602,7 +2376,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2611,7 +2385,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2621,21 +2395,21 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebListOrders</td>
         <td class="text-center">10</td>
-        <td class="text-center">8</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</td>
+        <td class="text-center">10</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('c29', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2644,7 +2418,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2653,7 +2427,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2662,7 +2436,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -2671,67 +2445,25 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft29.5" class="none bg-danger">
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 394, in test_order_authors_all_links
-    self.assertEqual(books[1][0][&#39;title&#39;], &#34;testbook&#34;)
-AssertionError: &#39;Very long extra super turbo cool title without any issue of ...&#39; != &#39;testbook&#39;
-- Very long extra super turbo cool title without any issue of ...
-+ testbook</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et29.6" class="none bg-info">
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et29.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et29.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et29.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 382, in test_order_series_all_links
-    author_books[1][0][&#39;series_ele&#39;].click()
-KeyError: &#39;series_ele&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -2740,7 +2472,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -2749,7 +2481,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -2758,7 +2490,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -2776,13 +2508,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2791,7 +2523,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2800,7 +2532,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2809,7 +2541,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2818,19 +2550,19 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2844,7 +2576,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2853,7 +2585,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2862,7 +2594,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2871,7 +2603,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2889,13 +2621,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2904,7 +2636,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2913,7 +2645,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2922,7 +2654,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2931,7 +2663,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2940,7 +2672,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2949,7 +2681,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2958,7 +2690,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2967,7 +2699,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2976,7 +2708,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2985,7 +2717,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2994,7 +2726,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3003,7 +2735,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3012,7 +2744,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3021,7 +2753,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3039,13 +2771,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3054,7 +2786,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3072,13 +2804,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3087,7 +2819,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3105,13 +2837,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3120,7 +2852,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3129,7 +2861,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3138,7 +2870,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3147,7 +2879,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3156,7 +2888,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3165,7 +2897,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3174,7 +2906,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3183,7 +2915,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3192,7 +2924,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3201,7 +2933,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3210,7 +2942,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3219,7 +2951,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3228,7 +2960,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3237,7 +2969,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3246,7 +2978,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3255,7 +2987,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3264,7 +2996,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3273,7 +3005,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3282,7 +3014,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3291,7 +3023,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3300,7 +3032,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3309,7 +3041,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3327,13 +3059,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3351,13 +3083,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 5)">Detail</a>
+            <a onclick="showClassDetail('c35', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3366,7 +3098,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3375,7 +3107,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3384,7 +3116,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.4' class='hiddenRow bg-success'>
+        <tr id='pt35.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3393,7 +3125,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt36.5' class='hiddenRow bg-success'>
+        <tr id='pt35.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3411,13 +3143,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3435,13 +3167,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3459,13 +3191,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 8)">Detail</a>
+            <a onclick="showClassDetail('c38', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3474,7 +3206,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt38.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3483,7 +3215,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt38.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3492,7 +3224,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt38.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3501,7 +3233,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt38.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3510,7 +3242,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt38.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3519,7 +3251,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt38.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3528,7 +3260,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt38.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3546,13 +3278,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 3)">Detail</a>
+            <a onclick="showClassDetail('c39', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3561,7 +3293,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3570,7 +3302,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3588,13 +3320,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 16)">Detail</a>
+            <a onclick="showClassDetail('c40', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3603,7 +3335,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3612,7 +3344,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3621,7 +3353,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3630,7 +3362,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3639,7 +3371,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3648,7 +3380,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3657,7 +3389,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3666,7 +3398,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt40.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3675,7 +3407,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.10' class='hiddenRow bg-success'>
+        <tr id='pt40.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3684,7 +3416,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.11' class='hiddenRow bg-success'>
+        <tr id='pt40.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3693,7 +3425,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.12' class='hiddenRow bg-success'>
+        <tr id='pt40.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3702,7 +3434,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.13' class='hiddenRow bg-success'>
+        <tr id='pt40.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3711,19 +3443,19 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="st41.14" class="none bg-warning">
+        <tr id="st40.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st40.14" 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_st41.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st40.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3737,7 +3469,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.15' class='hiddenRow bg-success'>
+        <tr id='pt40.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3746,7 +3478,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt41.16' class='hiddenRow bg-success'>
+        <tr id='pt40.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3764,13 +3496,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 9)">Detail</a>
+            <a onclick="showClassDetail('c41', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3779,7 +3511,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3788,7 +3520,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3797,7 +3529,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3806,7 +3538,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3815,7 +3547,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3824,19 +3556,19 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="st42.7" class="none bg-warning">
+        <tr id="st41.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.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_st42.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3850,7 +3582,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3859,7 +3591,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3877,13 +3609,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 4)">Detail</a>
+            <a onclick="showClassDetail('c42', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3892,7 +3624,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3901,7 +3633,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3910,7 +3642,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -3928,13 +3660,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 18)">Detail</a>
+            <a onclick="showClassDetail('c43', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3943,7 +3675,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3952,7 +3684,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3961,7 +3693,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3970,7 +3702,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3979,7 +3711,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3988,7 +3720,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3997,7 +3729,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4006,7 +3738,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4015,7 +3747,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt43.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4024,7 +3756,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt43.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4033,7 +3765,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt43.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4042,7 +3774,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt43.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4051,7 +3783,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt43.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4060,7 +3792,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt43.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4069,7 +3801,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt43.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4078,7 +3810,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt43.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4087,7 +3819,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt43.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4105,13 +3837,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 1)">Detail</a>
+            <a onclick="showClassDetail('c44', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4129,13 +3861,13 @@ KeyError: &#39;series_ele&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 21)">Detail</a>
+            <a onclick="showClassDetail('c45', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4144,7 +3876,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4153,7 +3885,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4162,7 +3894,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4171,7 +3903,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4180,7 +3912,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4189,7 +3921,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4198,7 +3930,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4207,7 +3939,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4216,7 +3948,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4225,7 +3957,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4234,7 +3966,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4243,7 +3975,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4252,7 +3984,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4261,7 +3993,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4270,7 +4002,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4279,7 +4011,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4288,7 +4020,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4297,7 +4029,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt45.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4306,7 +4038,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt45.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4315,7 +4047,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt45.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4325,21 +4057,21 @@ KeyError: &#39;series_ele&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">35</td>
-        <td class="text-center">33</td>
-        <td class="text-center">2</td>
+        <td class="text-center">35</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('c47', 35)">Detail</a>
+            <a onclick="showClassDetail('c46', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4348,7 +4080,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4357,7 +4089,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4366,7 +4098,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4375,7 +4107,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4384,7 +4116,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4393,7 +4125,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4402,7 +4134,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4411,7 +4143,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4420,7 +4152,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4429,7 +4161,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4438,7 +4170,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4447,7 +4179,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4456,7 +4188,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4465,7 +4197,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4474,7 +4206,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4483,7 +4215,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4492,7 +4224,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4501,7 +4233,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4510,7 +4242,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4519,7 +4251,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4528,7 +4260,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.22' class='hiddenRow bg-success'>
+        <tr id='pt46.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4537,7 +4269,7 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id='pt47.23' class='hiddenRow bg-success'>
+        <tr id='pt46.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4546,36 +4278,16 @@ KeyError: &#39;series_ele&#39;</pre>
     
     
     
-        <tr id="ft47.24" class="none bg-danger">
+        <tr id='pt46.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft47.24')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft47.24" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft47.24').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 814, in test_link_column_to_read_status
-    self.assertTrue(author[1][0][&#39;read&#39;])
-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>
     
     
     
-        <tr id='pt47.25' class='hiddenRow bg-success'>
+        <tr id='pt46.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4584,36 +4296,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft47.26" class="none bg-danger">
+        <tr id='pt46.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft47.26')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft47.26" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft47.26').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 898, in test_read_status_visible
-    self.assertEqual(len(list_element[1]), 1)
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt47.27' class='hiddenRow bg-success'>
+        <tr id='pt46.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4622,7 +4314,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.28' class='hiddenRow bg-success'>
+        <tr id='pt46.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4631,7 +4323,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.29' class='hiddenRow bg-success'>
+        <tr id='pt46.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4640,7 +4332,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.30' class='hiddenRow bg-success'>
+        <tr id='pt46.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4649,7 +4341,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.31' class='hiddenRow bg-success'>
+        <tr id='pt46.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4658,7 +4350,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.32' class='hiddenRow bg-success'>
+        <tr id='pt46.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4667,7 +4359,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.33' class='hiddenRow bg-success'>
+        <tr id='pt46.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4676,7 +4368,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.34' class='hiddenRow bg-success'>
+        <tr id='pt46.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4685,7 +4377,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt47.35' class='hiddenRow bg-success'>
+        <tr id='pt46.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4703,13 +4395,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c48', 16)">Detail</a>
+            <a onclick="showClassDetail('c47', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4718,7 +4410,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4727,7 +4419,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4736,7 +4428,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4745,7 +4437,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4754,7 +4446,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4763,7 +4455,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4772,7 +4464,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4781,7 +4473,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4790,7 +4482,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4799,7 +4491,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4808,7 +4500,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4817,7 +4509,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4826,7 +4518,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4835,7 +4527,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4844,7 +4536,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt48.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4855,10 +4547,10 @@ AssertionError: 0 != 1</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>409</td>
-        <td>391</td>
-        <td>9</td>
-        <td>3</td>
+        <td>406</td>
+        <td>400</td>
+        <td>0</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -5301,7 +4993,7 @@ AssertionError: 0 != 1</pre>
 </div>
 
 <script>
-    drawCircle(391, 9, 3, 6);
+    drawCircle(400, 0, 0, 6);
     showCase(5);
 </script>
 

From 73d359af05701cb1cf2ace7dee26f14ea7238cb4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 28 Mar 2022 19:02:12 +0200
Subject: [PATCH 171/220] Bugfix logging with gdrive Update
 optional-requirements.txt

---
 cps/gdriveutils.py        | 29 +++++++++++++++--------------
 cps/helper.py             |  2 +-
 optional-requirements.txt |  4 ++--
 setup.cfg                 |  4 ++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index e75f3742..6073777e 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -32,7 +32,7 @@ try:
     from sqlalchemy.orm import declarative_base
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.exc import OperationalError, InvalidRequestError
+from sqlalchemy.exc import OperationalError, InvalidRequestError, IntegrityError
 from sqlalchemy.sql.expression import text
 
 #try:
@@ -81,7 +81,7 @@ if gdrive_support:
     if not logger.is_debug_enabled():
         logger.get('googleapiclient.discovery').setLevel(logger.logging.ERROR)
 else:
-    log.debug("Cannot import pydrive, httplib2, using gdrive will not work: %s", importError)
+    log.debug("Cannot import pydrive, httplib2, using gdrive will not work: {}".format(importError))
 
 
 class Singleton:
@@ -213,7 +213,7 @@ def getDrive(drive=None, gauth=None):
             try:
                 gauth.Refresh()
             except RefreshError as e:
-                log.error("Google Drive error: %s", e)
+                log.error("Google Drive error: {}".format(e))
             except Exception as ex:
                 log.error_or_exception(ex)
         else:
@@ -225,7 +225,7 @@ def getDrive(drive=None, gauth=None):
         try:
             drive.auth.Refresh()
         except RefreshError as e:
-            log.error("Google Drive error: %s", e)
+            log.error("Google Drive error: {}".format(e))
     return drive
 
 def listRootFolders():
@@ -234,7 +234,7 @@ def listRootFolders():
         folder = "'root' in parents and mimeType = 'application/vnd.google-apps.folder' and trashed = false"
         fileList = drive.ListFile({'q': folder}).GetList()
     except (ServerNotFoundError, ssl.SSLError, RefreshError) as e:
-        log.info("GDrive Error %s" % e)
+        log.info("GDrive Error {}".format(e))
         fileList = []
     return fileList
 
@@ -272,7 +272,7 @@ def getEbooksFolderId(drive=None):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error_or_exception('Database error: %s', ex)
+            log.error_or_exception('Database error: {}'.format(ex))
             session.rollback()
         return gDriveId.gdrive_id
 
@@ -288,6 +288,7 @@ def getFile(pathId, fileName, drive):
 
 def getFolderId(path, drive):
     # drive = getDrive(drive)
+    currentFolderId = None
     try:
         currentFolderId = getEbooksFolderId(drive)
         sqlCheckPath = path if path[-1] == '/' else path + '/'
@@ -320,8 +321,8 @@ def getFolderId(path, drive):
                 session.commit()
         else:
             currentFolderId = storedPathName.gdrive_id
-    except OperationalError as ex:
-        log.error_or_exception('Database error: %s', ex)
+    except (OperationalError, IntegrityError) as ex:
+        log.error_or_exception('Database error: {}'.format(ex))
         session.rollback()
     except ApiRequestError as ex:
         log.error('{} {}'.format(ex.error['message'], path))
@@ -545,7 +546,7 @@ def deleteDatabaseOnChange():
         session.commit()
     except (OperationalError, InvalidRequestError) as ex:
         session.rollback()
-        log.error_or_exception('Database error: %s', ex)
+        log.error_or_exception('Database error: {}'.format(ex))
 
 
 def updateGdriveCalibreFromLocal():
@@ -563,7 +564,7 @@ def updateDatabaseOnEdit(ID,newPath):
         try:
             session.commit()
         except OperationalError as ex:
-            log.error_or_exception('Database error: %s', ex)
+            log.error_or_exception('Database error: {}'.format(ex))
             session.rollback()
 
 
@@ -573,7 +574,7 @@ def deleteDatabaseEntry(ID):
     try:
         session.commit()
     except OperationalError as ex:
-        log.error_or_exception('Database error: %s', ex)
+        log.error_or_exception('Database error: {}'.format(ex))
         session.rollback()
 
 
@@ -594,7 +595,7 @@ def get_cover_via_gdrive(cover_path):
             try:
                 session.commit()
             except OperationalError as ex:
-                log.error_or_exception('Database error: %s', ex)
+                log.error_or_exception('Database error: {}'.format(ex))
                 session.rollback()
         return df.metadata.get('webContentLink')
     else:
@@ -616,7 +617,7 @@ def do_gdrive_download(df, headers, convert_encoding=False):
 
     def stream(convert_encoding):
         for byte in s:
-            headers = {"Range": 'bytes=%s-%s' % (byte[0], byte[1])}
+            headers = {"Range": 'bytes={}-{}'.format(byte[0], byte[1])}
             resp, content = df.auth.Get_Http_Object().request(download_url, headers=headers)
             if resp.status == 206:
                 if convert_encoding:
@@ -624,7 +625,7 @@ def do_gdrive_download(df, headers, convert_encoding=False):
                     content = content.decode(result['encoding']).encode('utf-8')
                 yield content
             else:
-                log.warning('An error occurred: %s', resp)
+                log.warning('An error occurred: {}'.format(resp))
                 return
     return Response(stream_with_context(stream(convert_encoding)), headers=headers)
 
diff --git a/cps/helper.py b/cps/helper.py
index 765cf22b..4928d388 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -708,7 +708,7 @@ def get_book_cover_internal(book, use_generic_cover_on_failure):
                 if path:
                     return redirect(path)
                 else:
-                    log.error('%s/cover.jpg not found on Google Drive', book.path)
+                    log.error('{}/cover.jpg not found on Google Drive'.format(book.path))
                     return get_cover_on_failure(use_generic_cover_on_failure)
             except Exception as ex:
                 log.error_or_exception(ex)
diff --git a/optional-requirements.txt b/optional-requirements.txt
index e54b0829..208d889d 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.42.0
+google-api-python-client>=1.7.11,<2.43.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.42.0
+google-api-python-client>=1.7.11,<2.43.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index 5b8ce678..9ad1164a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -59,7 +59,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.37.0
+	google-api-python-client>=1.7.11,<2.43.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -72,7 +72,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.5.0
-	google-api-python-client>=1.7.11,<2.37.0
+	google-api-python-client>=1.7.11,<2.43.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From 7861f8a89a6657b209dae2fde6a31d4d4330b141 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 28 Mar 2022 21:43:23 +0200
Subject: [PATCH 172/220] Prevent problems with werkzeug and flask_login on new
 installations

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index de08fbda..7b03ffe4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
+werkzeug<2.1.0
 Babel>=1.3,<3.0
 Flask-Babel>=0.11.1,<2.1.0
 Flask-Login>=0.3.2,<0.5.1

From 834edadc280128c9bda86c4273056e1fd9daa19d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 29 Mar 2022 18:28:53 +0200
Subject: [PATCH 173/220] Possible fix for #2350 and #2351 (databse locked) Fix
 for #2309 (long unicode filenames could get to long)

---
 cps.py                                  | 10 ++---
 cps/helper.py                           | 18 ++++++++-
 test/Calibre-Web TestSummary_Linux.html | 50 +++++++++++++++++--------
 3 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/cps.py b/cps.py
index 8959679a..bffdfc7f 100755
--- a/cps.py
+++ b/cps.py
@@ -16,11 +16,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/>.
-try:
-    from gevent import monkey
-    monkey.patch_all()
-except ImportError:
-    pass
+#try:
+#from gevent import monkey
+#monkey.patch_all()
+#except ImportError:
+#    pass
 
 import sys
 import os
diff --git a/cps/helper.py b/cps/helper.py
index 4928d388..742188d0 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -19,6 +19,7 @@
 
 import os
 import io
+import sys
 import mimetypes
 import re
 import shutil
@@ -224,11 +225,23 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
 
+def shorten_component(s, by_what):
+    l = len(s)
+    if l < by_what:
+        return s
+    l = (l - by_what)//2
+    if l <= 0:
+        return s
+    return s[:l] + s[-l:]
+
+
 def get_valid_filename(value, replace_whitespace=True, chars=128):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
     """
+
+
     if value[-1:] == u'.':
         value = value[:-1]+u'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
@@ -239,7 +252,10 @@ def get_valid_filename(value, replace_whitespace=True, chars=128):
         value = re.sub(r'[*+:\\\"/<>?]+', u'_', value, flags=re.U)
         # pipe has to be replaced with comma
         value = re.sub(r'[|]+', u',', value, flags=re.U)
-    value = value[:chars].strip()
+
+    filename_encoding_for_length = 'utf-16' if sys.platform == "win32" or sys.platform == "darwin" else 'utf-8'
+    value = value.encode(filename_encoding_for_length)[:chars].decode('utf-8', errors='ignore').strip()
+
     if not value:
         raise ValueError("Filename cannot be empty")
     return value
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 54fda2b1..524db518 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,14 +37,14 @@
       <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>2022-03-28 06:40:49</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-03-28 21:45:14</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>2022-03-28 12:18:13</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-03-29 03:21:52</p>
             
         </div>
       </div>
@@ -1562,11 +1562,11 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1576,11 +1576,31 @@
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id="ft15.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</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_ft15.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.0 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -4548,8 +4568,8 @@
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
         <td>406</td>
-        <td>400</td>
-        <td>0</td>
+        <td>399</td>
+        <td>1</td>
         <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
@@ -4643,6 +4663,12 @@
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>gevent</th>
+              <td>21.12.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>greenlet</th>
               <td>1.1.2</td>
@@ -4697,12 +4723,6 @@
               <td>Basic</td>
             </tr>
           
-            <tr>
-              <th>tornado</th>
-              <td>6.1</td>
-              <td>Basic</td>
-            </tr>
-          
             <tr>
               <th>Unidecode</th>
               <td>1.3.4</td>
@@ -4993,7 +5013,7 @@
 </div>
 
 <script>
-    drawCircle(400, 0, 0, 6);
+    drawCircle(399, 1, 0, 6);
     showCase(5);
 </script>
 

From c06754975ed11c1691ad81780b6ba27468aa4760 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 2 Apr 2022 11:37:02 +0200
Subject: [PATCH 174/220] Added bookeen to the reader for "simple theming"
 (#1861)

---
 cps.py                 | 5 -----
 cps/render_template.py | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/cps.py b/cps.py
index bffdfc7f..2db11e2b 100755
--- a/cps.py
+++ b/cps.py
@@ -16,11 +16,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
-#try:
-#from gevent import monkey
-#monkey.patch_all()
-#except ImportError:
-#    pass
 
 import sys
 import os
diff --git a/cps/render_template.py b/cps/render_template.py
index 1bc5454d..0c5423c9 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -30,7 +30,8 @@ log = logger.create()
 
 def get_sidebar_config(kwargs=None):
     kwargs = kwargs or []
-    simple = bool([e for e in ['kindle', 'tolino', "kobo"] if (e in request.headers.get('User-Agent', "").lower())])
+    simple = bool([e for e in ['kindle', 'tolino', "kobo", "bookeen"]
+                   if (e in request.headers.get('User-Agent', "").lower())])
     if 'content' in kwargs:
         content = kwargs['content']
         content = isinstance(content, (User, LocalProxy)) and not content.role_anonymous()

From f36d3a76be04ae6d899ef0a5bb6070bf785bd4dd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 2 Apr 2022 17:29:30 +0200
Subject: [PATCH 175/220] Return false if custom columns generate an error
 during connect database Replaced existing with valid in readme to make it
 more clear what database is needed

---
 README.md | 2 +-
 cps/db.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 94be5b33..c528f09d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # About
 
-Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing [Calibre](https://calibre-ebook.com) database.
+Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using a valid [Calibre](https://calibre-ebook.com) database.
 
 [![GitHub License](https://img.shields.io/github/license/janeczku/calibre-web?style=flat-square)](https://github.com/janeczku/calibre-web/blob/master/LICENSE)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/w/janeczku/calibre-web?logo=github&style=flat-square&label=commits)]()
diff --git a/cps/db.py b/cps/db.py
index 3f64fbb5..d2977e07 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -592,6 +592,7 @@ class CalibreDB:
                 cls.setup_db_cc_classes(cc)
             except OperationalError as e:
                 log.error_or_exception(e)
+                return False
 
         cls.session_factory = scoped_session(sessionmaker(autocommit=False,
                                                           autoflush=True,

From fee76741a02899d2dfdc2ce29cfc27901a06383c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 3 Apr 2022 13:38:42 +0200
Subject: [PATCH 176/220] Update Testresult

---
 SECURITY.md                             |  4 ++++
 cps/constants.py                        |  2 +-
 setup.cfg                               |  8 ++++---
 test/Calibre-Web TestSummary_Linux.html | 32 +++++++++++++------------
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 54be54bd..78d5c6e2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -32,8 +32,12 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
 | V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
 | V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
+| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                            ||
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            ||
 | V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
+| V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                   ||
+| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                         ||
+| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley ||
 
 
 ## Statement regarding Log4j (CVE-2021-44228 and related)
diff --git a/cps/constants.py b/cps/constants.py
index cb5348d5..c2eb0527 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.18 Beta'}
+STABLE_VERSION = {'version': '0.6.18'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/setup.cfg b/setup.cfg
index 9ad1164a..49496fc9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,6 +38,7 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires = 
+	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
 	Flask-Login>=0.3.2,<0.5.1
@@ -52,9 +53,10 @@ install_requires =
 	tornado>=4.1,<6.2
 	Wand>=0.4.4,<0.7.0
 	unidecode>=0.04.19,<1.4.0
-	lxml>=3.8.0,<4.8.0
+	lxml>=3.8.0,<4.9.0
 	flask-wtf>=0.14.2,<1.1.0
 	chardet>=3.0.0,<4.1.0
+	advocate>=1.0.0,<1.1.0
 	
 
 [options.extras_require]
@@ -71,7 +73,7 @@ gdrive =
 	PyYAML>=3.12
 	rsa>=3.4.2,<4.9.0
 gmail = 
-	google-auth-oauthlib>=0.4.3,<0.5.0
+	google-auth-oauthlib>=0.4.3,<0.6.0
 	google-api-python-client>=1.7.11,<2.43.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
@@ -84,7 +86,7 @@ oauth =
 	SQLAlchemy-Utils>=0.33.5,<0.39.0
 metadata = 
 	rarfile>=3.2
-	scholarly>=1.2.0,<1.6
+	scholarly>=1.2.0,<1.7
 	markdown2>=2.0.0,<2.5.0
 	html2text>=2020.1.16,<2022.1.1
 	python-dateutil>=2.1,<2.9.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 524db518..392fdbea 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-03-28 21:45:14</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-03 07:19:10</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>2022-03-29 03:21:52</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-03 12:55:38</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>4h 46 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 47 min</p>
         </div>
       </div>
       </div>
@@ -1593,9 +1593,11 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 167, in test_load_metadata
-    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
-AssertionError: 0.0 not greater than or equal to 0.05</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 235, in test_load_metadata
+    self.assertEqual(&#34;奇想西遊記1&#34;, results[3][&#39;title&#39;])
+AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
+- 奇想西遊記1
++ 巧讀西遊記</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4599,7 +4601,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-37-generic #42~20.04.1-Ubuntu SMP Tue Mar 15 15:44:28 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-39-generic #44~20.04.1-Ubuntu SMP Thu Mar 24 16:43:35 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -4659,13 +4661,7 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>Flask-WTF</th>
-              <td>1.0.0</td>
-              <td>Basic</td>
-            </tr>
-          
-            <tr>
-              <th>gevent</th>
-              <td>21.12.0</td>
+              <td>1.0.1</td>
               <td>Basic</td>
             </tr>
           
@@ -4719,7 +4715,13 @@ AssertionError: 0.0 not greater than or equal to 0.05</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.32</td>
+              <td>1.4.34</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>tornado</th>
+              <td>6.1</td>
               <td>Basic</td>
             </tr>
           

From 8adae6ed0cd749f52af0300923c74c8c7c28b241 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 3 Apr 2022 20:26:43 +0200
Subject: [PATCH 177/220] Handle permission errors for static files (Fix for
 #2358) Version bump

---
 cps/cache_buster.py    | 15 +++++++++------
 cps/constants.py       |  2 +-
 cps/error_handler.py   |  5 +++--
 cps/helper.py          |  9 ++++++---
 cps/render_template.py | 14 +++++++++-----
 cps/web.py             |  6 +++++-
 6 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/cps/cache_buster.py b/cps/cache_buster.py
index 9619d605..ba19afd6 100644
--- a/cps/cache_buster.py
+++ b/cps/cache_buster.py
@@ -47,13 +47,16 @@ def init_cache_busting(app):
         for filename in filenames:
             # compute version component
             rooted_filename = os.path.join(dirpath, filename)
-            with open(rooted_filename, 'rb') as f:
-                file_hash = hashlib.md5(f.read()).hexdigest()[:7] # nosec
+            try:
+                with open(rooted_filename, 'rb') as f:
+                    file_hash = hashlib.md5(f.read()).hexdigest()[:7] # nosec
+                # save version to tables
+                file_path = rooted_filename.replace(static_folder, "")
+                file_path = file_path.replace("\\", "/")  # Convert Windows path to web path
+                hash_table[file_path] = file_hash
+            except PermissionError:
+                log.error("No permission to access {} file.".format(rooted_filename))
 
-            # save version to tables
-            file_path = rooted_filename.replace(static_folder, "")
-            file_path = file_path.replace("\\", "/")  # Convert Windows path to web path
-            hash_table[file_path] = file_hash
     log.debug('Finished computing cache-busting values')
 
     def bust_filename(filename):
diff --git a/cps/constants.py b/cps/constants.py
index c2eb0527..f40d16b0 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -154,7 +154,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages, publisher')
 
-STABLE_VERSION = {'version': '0.6.18'}
+STABLE_VERSION = {'version': '0.6.19 Beta'}
 
 NIGHTLY_VERSION = dict()
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/cps/error_handler.py b/cps/error_handler.py
index 37b7500e..67252a66 100644
--- a/cps/error_handler.py
+++ b/cps/error_handler.py
@@ -42,8 +42,9 @@ def error_http(error):
 
 def internal_error(error):
     return render_template('http_error.html',
-                           error_code="Internal Server Error",
-                           error_name=str(error),
+                           error_code="500 Internal Server Error",
+                           error_name='The server encountered an internal error and was unable to complete your '
+                                      'request. There is an error in the application.',
                            issue=True,
                            unconfigured=False,
                            error_stack=traceback.format_exc().split("\n"),
diff --git a/cps/helper.py b/cps/helper.py
index 742188d0..5d5cc021 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -698,9 +698,12 @@ def delete_book(book, calibrepath, book_format):
 
 def get_cover_on_failure(use_generic_cover):
     if use_generic_cover:
-        return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
-    else:
-        return None
+        try:
+            return send_from_directory(_STATIC_DIR, "generic_cover.jpg")
+        except PermissionError:
+            log.error("No permission to access generic_cover.jpg file.")
+            abort(403)
+    abort(404)
 
 
 def get_book_cover(book_id):
diff --git a/cps/render_template.py b/cps/render_template.py
index 0c5423c9..d2f40d6c 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -18,11 +18,11 @@
 
 from flask import render_template, request
 from flask_babel import gettext as _
-from flask import g
+from flask import g, abort
 from werkzeug.local import LocalProxy
 from flask_login import current_user
 
-from . import config, constants, ub, logger, db, calibre_db
+from . import config, constants, logger
 from .ub import User
 
 
@@ -119,6 +119,10 @@ def get_sidebar_config(kwargs=None):
 # Returns the template for rendering and includes the instance name
 def render_title_template(*args, **kwargs):
     sidebar, simple = get_sidebar_config(kwargs)
-    return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
-                           accept=constants.EXTENSIONS_UPLOAD, # read_book_ids=get_readbooks_ids(),
-                           *args, **kwargs)
+    try:
+        return render_template(instance=config.config_calibre_web_title, sidebar=sidebar, simple=simple,
+                               accept=constants.EXTENSIONS_UPLOAD,
+                               *args, **kwargs)
+    except PermissionError:
+        log.error("No permission to access {} file.".format(args[0]))
+        abort(403)
diff --git a/cps/web.py b/cps/web.py
index e8bf48e3..a0ecbb8e 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1368,7 +1368,11 @@ def get_cover(book_id):
 
 @web.route("/robots.txt")
 def get_robots():
-    return send_from_directory(constants.STATIC_DIR, "robots.txt")
+    try:
+        return send_from_directory(constants.STATIC_DIR, "robots.txt")
+    except PermissionError:
+        log.error("No permission to access robots.txt file.")
+        abort(403)
 
 
 @web.route("/show/<int:book_id>/<book_format>", defaults={'anyname': 'None'})

From 42b0226f1a2ac9f457ae693d87517252dbb7c2ec Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 4 Apr 2022 13:58:47 +0200
Subject: [PATCH 178/220] Fix for missing "query" entry in flask_session

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

diff --git a/cps/web.py b/cps/web.py
index a0ecbb8e..e6ca4d03 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -383,7 +383,7 @@ def render_books_list(data, sort_param, book_id, page):
         offset = int(int(config.config_books_per_page) * (page - 1))
         return render_search_results(term, offset, order, config.config_books_per_page)
     elif data == "advsearch":
-        term = json.loads(flask_session['query'])
+        term = json.loads(flask_session.get('query', '{}'))
         offset = int(int(config.config_books_per_page) * (page - 1))
         return render_adv_search_results(term, offset, order, config.config_books_per_page)
     else:
@@ -1556,7 +1556,7 @@ def login():
                     config.config_is_initial = False
                     return redirect_back(url_for("web.index"))
                 else:
-                    log.warning('Login failed for user "%s" IP-address: %s', form['username'], ip_address)
+                    log.warning('Login failed for user "{}" IP-address: {}'.format(form['username'], ip_address))
                     flash(_(u"Wrong Username or Password"), category="error")
 
     next_url = request.args.get('next', default=url_for("web.index"), type=str)

From d912c1c47606ada9b636d56905e4ac714efd9710 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 4 Apr 2022 14:37:39 +0200
Subject: [PATCH 179/220] Bugfix Quick start section

---
 README.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c528f09d..267f21ef 100644
--- a/README.md
+++ b/README.md
@@ -49,10 +49,11 @@ In the Wiki there are also examples for: a [manual installation](https://github.
 
 ## Quick start
 
-Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog
-Set `Location of Calibre database` to the path of the folder where your Calibre library (metadata.db) lives, push "submit" button\
-Optionally a Google Drive can be used to host the calibre library [-> Using Google Drive integration](https://github.com/janeczku/calibre-web/wiki/Configuration#using-google-drive-integration)
-Go to Login page
+Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog \
+Login with default admin login \
+Set `Location of Calibre database` to the path of the folder where your Calibre library (metadata.db) lives, push "submit" button \
+Optionally a Google Drive can be used to host the calibre library [-> Using Google Drive integration](https://github.com/janeczku/calibre-web/wiki/Configuration#using-google-drive-integration) \
+Afterwards you can configure your Calibre-Web instance ([Basic Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#basic-configuration) and [UI Configuration](https://github.com/janeczku/calibre-web/wiki/Configuration#ui-configuration) on admin page)  
 
 #### Default admin login:
 *Username:* admin\
@@ -67,7 +68,7 @@ Optionally, to enable on-the-fly conversion from one ebook format to another whe
 
 [Download and install](https://calibre-ebook.com/download) the Calibre desktop program for your platform and enter the folder including program name (normally /opt/calibre/ebook-convert, or C:\Program Files\calibre\ebook-convert.exe) in the field "calibre's converter tool" on the setup page.
 
-[Download](https://github.com/pgaskin/kepubify/releases/latest) Kepubify tool for your platform and place the binary starting with `kepubify` in Linux: `\opt\kepubify` Windows: `C:\Program Files\kepubify`.
+[Download](https://github.com/pgaskin/kepubify/releases/latest) Kepubify tool for your platform and place the binary starting with `kepubify` in Linux: `/opt/kepubify` Windows: `C:\Program Files\kepubify`.
 
 ## Docker Images
 

From 2d0af0ab496b84c97e1564d97eb5415f9ec6236b Mon Sep 17 00:00:00 2001
From: Wulf Rajek <40003252+AnonTester@users.noreply.github.com>
Date: Tue, 5 Apr 2022 01:26:35 +0100
Subject: [PATCH 180/220] Add pubdate, publisher and identifiers metadata #2163

---
 cps/comic.py     |  8 +++++--
 cps/constants.py |  2 +-
 cps/editbooks.py | 17 ++++++++++++++-
 cps/epub.py      | 22 ++++++++++++++++++--
 cps/fb2.py       |  4 +++-
 cps/uploader.py  | 54 +++++++-----------------------------------------
 6 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/cps/comic.py b/cps/comic.py
index 2549579e..8f3a6f61 100644
--- a/cps/comic.py
+++ b/cps/comic.py
@@ -130,7 +130,9 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
                 series=loaded_metadata.series or "",
                 series_id=loaded_metadata.issue or "",
                 languages=loaded_metadata.language,
-                publisher="")
+                publisher="",
+                pubdate="",
+                identifiers=[])
 
     return BookMeta(
         file_path=tmp_file_path,
@@ -143,4 +145,6 @@ def get_comic_info(tmp_file_path, original_file_name, original_file_extension, r
         series="",
         series_id="",
         languages="",
-        publisher="")
+        publisher="",
+        pubdate="",
+        identifiers=[])
diff --git a/cps/constants.py b/cps/constants.py
index f40d16b0..762336dd 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -152,7 +152,7 @@ def selected_roles(dictionary):
 
 # :rtype: BookMeta
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
-                                  'series_id, languages, publisher')
+                                  'series_id, languages, publisher, pubdate, identifiers')
 
 STABLE_VERSION = {'version': '0.6.19 Beta'}
 
diff --git a/cps/editbooks.py b/cps/editbooks.py
index c07e5d24..db87d891 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -983,8 +983,13 @@ def create_book_on_upload(modify_date, meta):
     # combine path and normalize path from Windows systems
     path = os.path.join(author_dir, title_dir).replace('\\', '/')
 
+    if meta.pubdate != "":
+        pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
+    else:
+        pubdate = datetime(101, 1, 1)
+
     # Calibre adds books with utc as timezone
-    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), datetime(101, 1, 1),
+    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), pubdate,
                        '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
 
     modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
@@ -1017,6 +1022,16 @@ def create_book_on_upload(modify_date, meta):
 
     # flush content, get db_book.id available
     calibre_db.session.flush()
+
+    # Handle identifiers now that db_book.id is available
+    identifier_list = []
+    for type_key, type_value in meta.identifiers:
+        identifier_list.append(db.Identifiers(type_value, type_key, db_book.id))
+    modification, warning = modify_identifiers(identifier_list, db_book.identifiers, calibre_db.session)
+    if warning:
+        flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+    modify_date |= modification
+
     return db_book, input_authors, title_dir, renamed_authors
 
 
diff --git a/cps/epub.py b/cps/epub.py
index 80c12c35..d358d038 100644
--- a/cps/epub.py
+++ b/cps/epub.py
@@ -63,13 +63,15 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     epub_metadata = {}
 
-    for s in ['title', 'description', 'creator', 'language', 'subject']:
+    for s in ['title', 'description', 'creator', 'language', 'subject', 'publisher', 'date']:
         tmp = p.xpath('dc:%s/text()' % s, namespaces=ns)
         if len(tmp) > 0:
             if s == 'creator':
                 epub_metadata[s] = ' & '.join(split_authors(tmp))
             elif s == 'subject':
                 epub_metadata[s] = ', '.join(tmp)
+            elif s == 'date':
+                epub_metadata[s] = tmp[0][:10]
             else:
                 epub_metadata[s] = tmp[0]
         else:
@@ -78,6 +80,12 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
     if epub_metadata['subject'] == 'Unknown':
         epub_metadata['subject'] = ''
 
+    if epub_metadata['publisher'] == u'Unknown':
+        epub_metadata['publisher'] = ''
+
+    if epub_metadata['date'] == u'Unknown':
+        epub_metadata['date'] = ''
+
     if epub_metadata['description'] == u'Unknown':
         description = tree.xpath("//*[local-name() = 'description']/text()")
         if len(description) > 0:
@@ -92,6 +100,14 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
 
     cover_file = parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path)
 
+    identifiers = []
+    for node in p.xpath('dc:identifier', namespaces=ns):
+        identifier_name=node.attrib.values()[-1];
+        identifier_value=node.text;
+        if identifier_name in ('uuid','calibre'):
+            continue;
+        identifiers.append( [identifier_name, identifier_value] )
+
     if not epub_metadata['title']:
         title = original_file_name
     else:
@@ -108,7 +124,9 @@ def get_epub_info(tmp_file_path, original_file_name, original_file_extension):
         series=epub_metadata['series'].encode('utf-8').decode('utf-8'),
         series_id=epub_metadata['series_id'].encode('utf-8').decode('utf-8'),
         languages=epub_metadata['language'],
-        publisher="")
+        publisher=epub_metadata['publisher'].encode('utf-8').decode('utf-8'),
+        pubdate=epub_metadata['date'],
+        identifiers=identifiers)
 
 
 def parse_epub_cover(ns, tree, epub_zip, cover_path, tmp_file_path):
diff --git a/cps/fb2.py b/cps/fb2.py
index 21586736..c4b89fd6 100644
--- a/cps/fb2.py
+++ b/cps/fb2.py
@@ -77,4 +77,6 @@ def get_fb2_info(tmp_file_path, original_file_extension):
         series="",
         series_id="",
         languages="",
-        publisher="")
+        publisher="",
+        pubdate="",
+        identifiers=[])
diff --git a/cps/uploader.py b/cps/uploader.py
index 992d188c..7a0359b3 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -107,52 +107,10 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
         series="",
         series_id="",
         languages="",
-        publisher="")
-
-
-def parse_xmp(pdf_file):
-    """
-    Parse XMP Metadata and prepare for BookMeta object
-    """
-    try:
-        xmp_info = pdf_file.getXmpMetadata()
-    except Exception as ex:
-        log.debug('Can not read XMP metadata {}'.format(ex))
-        return None
-
-    if xmp_info:
-        try:
-            xmp_author = xmp_info.dc_creator # list
-        except AttributeError:
-            xmp_author = ['']
-
-        if xmp_info.dc_title:
-            xmp_title = xmp_info.dc_title['x-default']
-        else:
-            xmp_title = ''
-
-        if xmp_info.dc_description:
-            xmp_description = xmp_info.dc_description['x-default']
-        else:
-            xmp_description = ''
-
-        languages = []
-        try:
-            for i in xmp_info.dc_language:
-                #calibre-web currently only takes one language.
-                languages.append(isoLanguages.get_lang3(i))
-        except AttributeError:
-            languages.append('')
-
-        xmp_tags = ', '.join(xmp_info.dc_subject)
-        xmp_publisher = ', '.join(xmp_info.dc_publisher)
-
-        return {'author': xmp_author,
-                    'title': xmp_title,
-                    'subject': xmp_description,
-                    'tags': xmp_tags, 'languages': languages,
-                    'publisher': xmp_publisher
-                    }
+        publisher="",
+        pubdate="",
+        identifiers=[]
+        )
 
 
 def parse_xmp(pdf_file):
@@ -251,7 +209,9 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         series="",
         series_id="",
         languages=','.join(languages),
-        publisher=publisher)
+        publisher=publisher,
+        pubdate="",
+        identifiers=[])
 
 
 def pdf_preview(tmp_file_path, tmp_dir):

From a63af5882ed9e97284dc81cc198e06267b68ca1a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 5 Apr 2022 19:04:42 +0200
Subject: [PATCH 181/220] Fix for #2363 (Handle empty response from
 lubimyczytac metadata provider)

---
 cps/metadata_provider/lubimyczytac.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 814a785e..90a6b2d8 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -113,17 +113,18 @@ class LubimyCzytac(Metadata):
     ) -> Optional[List[MetaRecord]]:
         if self.active:
             result = requests.get(self._prepare_query(title=query))
-            root = fromstring(result.text)
-            lc_parser = LubimyCzytacParser(root=root, metadata=self)
-            matches = lc_parser.parse_search_results()
-            if matches:
-                with ThreadPool(processes=10) as pool:
-                    final_matches = pool.starmap(
-                        lc_parser.parse_single_book,
-                        [(match, generic_cover, locale) for match in matches],
-                    )
-                return final_matches
-            return matches
+            if result.text:
+                root = fromstring(result.text)
+                lc_parser = LubimyCzytacParser(root=root, metadata=self)
+                matches = lc_parser.parse_search_results()
+                if matches:
+                    with ThreadPool(processes=10) as pool:
+                        final_matches = pool.starmap(
+                            lc_parser.parse_single_book,
+                            [(match, generic_cover, locale) for match in matches],
+                        )
+                    return final_matches
+                return matches
 
     def _prepare_query(self, title: str) -> str:
         query = ""

From d770e5392ee43789d51fcdbece4ad9f2c9f75d4c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 6 Apr 2022 11:12:57 +0200
Subject: [PATCH 182/220] Further fix for #2363

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

diff --git a/cps/metadata_provider/lubimyczytac.py b/cps/metadata_provider/lubimyczytac.py
index 90a6b2d8..4a77f4ea 100644
--- a/cps/metadata_provider/lubimyczytac.py
+++ b/cps/metadata_provider/lubimyczytac.py
@@ -125,6 +125,7 @@ class LubimyCzytac(Metadata):
                         )
                     return final_matches
                 return matches
+            return []
 
     def _prepare_query(self, title: str) -> str:
         query = ""

From 1136383b9a2d0787018ff245f174a7f914cc8b4a Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 11 Apr 2022 19:15:50 +0200
Subject: [PATCH 183/220] Bugfix for cli folder names as -p or -g parameters

---
 cps/__init__.py    |  4 ++--
 cps/cli.py         | 13 ++++++++++---
 cps/constants.py   |  2 ++
 cps/gdriveutils.py | 11 ++++-------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 0b912d23..62e45e72 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -91,7 +91,7 @@ if wtf_present:
 else:
     csrf = None
 
-ub.init_db(cli.settingspath)
+ub.init_db(cli.settings_path)
 # pylint: disable=no-member
 config = config_sql.load_configuration(ub.session)
 
@@ -106,7 +106,7 @@ log = logger.create()
 from . import services
 
 db.CalibreDB.update_config(config)
-db.CalibreDB.setup_db(config.config_calibre_dir, cli.settingspath)
+db.CalibreDB.setup_db(config.config_calibre_dir, cli.settings_path)
 
 
 calibre_db = db.CalibreDB()
diff --git a/cps/cli.py b/cps/cli.py
index 36c03513..629fd76d 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -24,7 +24,7 @@ import socket
 from .constants import CONFIG_DIR as _CONFIG_DIR
 from .constants import STABLE_VERSION as _STABLE_VERSION
 from .constants import NIGHTLY_VERSION as _NIGHTLY_VERSION
-
+from .constants import DEFAULT_SETTINGS_FILE, DEFAULT_GDRIVE_FILE
 
 def version_info():
     if _NIGHTLY_VERSION[1].startswith('$Format'):
@@ -51,8 +51,15 @@ parser.add_argument('-d', action='store_true', help='Dry run of updater to check
 parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
 args = parser.parse_args()
 
-settingspath = args.p or os.path.join(_CONFIG_DIR, "app.db")
-gdpath       = args.g or os.path.join(_CONFIG_DIR, "gdrive.db")
+settings_path = args.p or os.path.join(_CONFIG_DIR, DEFAULT_SETTINGS_FILE)
+gd_path = args.g or os.path.join(_CONFIG_DIR, DEFAULT_GDRIVE_FILE)
+
+if os.path.isdir(settings_path):
+    settings_path = os.path.join(settings_path, DEFAULT_SETTINGS_FILE)
+
+if os.path.isdir(gd_path):
+    gd_path = os.path.join(gd_path, DEFAULT_GDRIVE_FILE)
+
 
 # handle and check parameter for ssl encryption
 certfilepath = None
diff --git a/cps/constants.py b/cps/constants.py
index f40d16b0..57c98be1 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -43,6 +43,8 @@ if HOME_CONFIG:
 else:
     CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', BASE_DIR)
 
+DEFAULT_SETTINGS_FILE = "app.db"
+DEFAULT_GDRIVE_FILE = "gdrive.db"
 
 ROLE_USER               = 0 << 0
 ROLE_ADMIN              = 1 << 0
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 6073777e..ee8ee953 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -35,10 +35,6 @@ except ImportError:
 from sqlalchemy.exc import OperationalError, InvalidRequestError, IntegrityError
 from sqlalchemy.sql.expression import text
 
-#try:
-#    from six import __version__ as six_version
-#except ImportError:
-#    six_version = "not installed"
 try:
     from httplib2 import __version__ as httplib2_version
 except ImportError:
@@ -141,11 +137,12 @@ class Gdrive:
     def __init__(self):
         self.drive = getDrive(gauth=Gauth.Instance().auth)
 
+
 def is_gdrive_ready():
     return os.path.exists(SETTINGS_YAML) and os.path.exists(CREDENTIALS)
 
 
-engine = create_engine('sqlite:///{0}'.format(cli.gdpath), echo=False)
+engine = create_engine('sqlite:///{0}'.format(cli.gd_path), echo=False)
 Base = declarative_base()
 
 # Open session for database connection
@@ -193,11 +190,11 @@ def migrate():
                 session.execute('ALTER TABLE gdrive_ids2 RENAME to gdrive_ids')
             break
 
-if not os.path.exists(cli.gdpath):
+if not os.path.exists(cli.gd_path):
     try:
         Base.metadata.create_all(engine)
     except Exception as ex:
-        log.error("Error connect to database: {} - {}".format(cli.gdpath, ex))
+        log.error("Error connect to database: {} - {}".format(cli.gd_path, ex))
         raise
 migrate()
 

From 652d0fd86faac32680444c96d57327fd29c8a7b8 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 11 Apr 2022 19:40:43 +0200
Subject: [PATCH 184/220] Update google-api-python-client version

---
 optional-requirements.txt | 4 ++--
 setup.cfg                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/optional-requirements.txt b/optional-requirements.txt
index 208d889d..fea410e5 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.43.0
+google-api-python-client>=1.7.11,<2.44.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.43.0
+google-api-python-client>=1.7.11,<2.44.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0
diff --git a/setup.cfg b/setup.cfg
index 49496fc9..e9c23604 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -61,7 +61,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.43.0
+	google-api-python-client>=1.7.11,<2.44.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -74,7 +74,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.43.0
+	google-api-python-client>=1.7.11,<2.44.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From adf6728f142378d1b3b2c81acae21d02858d6de3 Mon Sep 17 00:00:00 2001
From: Wulf Rajek <40003252+AnonTester@users.noreply.github.com>
Date: Tue, 12 Apr 2022 00:22:05 +0100
Subject: [PATCH 185/220] Gracefully deal with incorrect dates

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

diff --git a/cps/editbooks.py b/cps/editbooks.py
index db87d891..b14f79e0 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -983,9 +983,9 @@ def create_book_on_upload(modify_date, meta):
     # combine path and normalize path from Windows systems
     path = os.path.join(author_dir, title_dir).replace('\\', '/')
 
-    if meta.pubdate != "":
+    try:
         pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
-    else:
+    except:
         pubdate = datetime(101, 1, 1)
 
     # Calibre adds books with utc as timezone

From 028e6855a71bb064ffc5a8b34cd240e5e5442c06 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 12 Apr 2022 18:45:06 +0200
Subject: [PATCH 186/220] Pagination button disapears in standard theme once
 infinite scroll is triggered

---
 cps/static/js/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index b18cf229..91084f06 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -381,8 +381,8 @@ $(function() {
             //extraScrollPx: 300
         });
         $loadMore.on( "append.infiniteScroll", function( event, response, path, data ) {
+            $(".pagination").addClass("hidden").html(() => $(response).find(".pagination").html());
             if ($("body").hasClass("blur")) {
-                $(".pagination").addClass("hidden").html(() => $(response).find(".pagination").html());
                 $(" a:not(.dropdown-toggle) ")
                   .removeAttr("data-toggle");
             }

From 83b99fcb1a6fc60a81023fec835e22883c2a903e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 12 Apr 2022 19:33:00 +0200
Subject: [PATCH 187/220] Fix cover upload url with spaces at the end Support
 image/jpg as upload format mimetype, remove redundant check of mimetype

---
 cps/editbooks.py |  2 +-
 cps/helper.py    | 30 ++++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index c07e5d24..ab2bd55e 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -810,7 +810,7 @@ def edit_book(book_id):
             if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
                 book.has_cover = 0
             else:
-                result, error = helper.save_cover_from_url(to_save["cover_url"], book.path)
+                result, error = helper.save_cover_from_url(to_save["cover_url"].strip(), book.path)
                 if result is True:
                     book.has_cover = 1
                     modify_date = True
diff --git a/cps/helper.py b/cps/helper.py
index 5d5cc021..69b3e2f8 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -753,6 +753,9 @@ def save_cover_from_url(url, book_path):
             log.error("python modul advocate is not installed but is needed")
             return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
+        #            # cover_processing()
+            # move_coverfile(meta, db_book)
+
         return save_cover(img, book_path)
     except (socket.gaierror,
             requests.exceptions.HTTPError,
@@ -802,24 +805,23 @@ def save_cover(img, book_path):
     content_type = img.headers.get('content-type')
 
     if use_IM:
-        if content_type not in ('image/jpeg', 'image/png', 'image/webp', 'image/bmp'):
+        if content_type not in ('image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/bmp'):
             log.error("Only jpg/jpeg/png/webp/bmp files are supported as coverfile")
             return False, _("Only jpg/jpeg/png/webp/bmp files are supported as coverfile")
         # convert to jpg because calibre only supports jpg
-        if content_type != 'image/jpg':
-            try:
-                if hasattr(img, 'stream'):
-                    imgc = Image(blob=img.stream)
-                else:
-                    imgc = Image(blob=io.BytesIO(img.content))
-                imgc.format = 'jpeg'
-                imgc.transform_colorspace("rgb")
-                img = imgc
-            except (BlobError, MissingDelegateError):
-                log.error("Invalid cover file content")
-                return False, _("Invalid cover file content")
+        try:
+            if hasattr(img, 'stream'):
+                imgc = Image(blob=img.stream)
+            else:
+                imgc = Image(blob=io.BytesIO(img.content))
+            imgc.format = 'jpeg'
+            imgc.transform_colorspace("rgb")
+            img = imgc
+        except (BlobError, MissingDelegateError):
+            log.error("Invalid cover file content")
+            return False, _("Invalid cover file content")
     else:
-        if content_type not in 'image/jpeg':
+        if content_type not in ['image/jpeg', 'image/jpg']:
             log.error("Only jpg/jpeg files are supported as coverfile")
             return False, _("Only jpg/jpeg files are supported as coverfile")
 

From df53a5d8c97fe6790f75ed1d9e073b5f614dfc01 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 13 Apr 2022 18:37:23 +0200
Subject: [PATCH 188/220] Prevent none comment while upload pdf documents

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

diff --git a/cps/uploader.py b/cps/uploader.py
index 992d188c..6aa811be 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -231,7 +231,7 @@ def pdf_meta(tmp_file_path, original_file_name, original_file_extension):
         if title == '':
             title = doc_info.title if doc_info.title else original_file_name
         if subject == '':
-            subject = doc_info.subject
+            subject = doc_info.subject or ""
         if tags == '' and '/Keywords' in doc_info:
             if isinstance(doc_info['/Keywords'], bytes):
                 tags = doc_info['/Keywords'].decode('utf-8')

From 2f3e5eadebd58dd4940d6f143c34f0368f084ccd Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 13 Apr 2022 19:34:14 +0200
Subject: [PATCH 189/220] Bug fix after merge (renamed variable)

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

diff --git a/cps/ub.py b/cps/ub.py
index 8d273c53..0360b572 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -857,7 +857,7 @@ def init_db(app_db_path):
 
 
 def get_new_session_instance():
-    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settingspath), echo=False)
+    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settings_path), echo=False)
     new_session = scoped_session(sessionmaker())
     new_session.configure(bind=new_engine)
 

From 6184e2b7bc79b4b1a5fcd4251c73c64d522db18d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 14 Apr 2022 19:58:15 +0200
Subject: [PATCH 190/220] Updated cve numbers

---
 SECURITY.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index 78d5c6e2..1b93b5f9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -24,20 +24,20 @@ To receive fixes for security vulnerabilities it is required to always upgrade t
 | V 0.6.13      | JavaScript could get executed  in the shelf title                                                                  ||
 | V 0.6.13      | Login with the old session cookie after logout. Thanks to @ibarrionuevo                                            ||
 | V 0.6.14      | CSRF was possible. Thanks to @mik317 and Hagai Wechsler (WhiteSource)                                              |CVE-2021-25965|
-| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                        ||
-| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                               ||
+| V 0.6.14      | Migrated some routes to POST-requests (CSRF protection). Thanks to @scara31                                        |CVE-2021-4164|
+| V 0.6.15      | Fix for "javascript:" script links in identifier. Thanks to @scara31                                               |CVE-2021-4170|
 | V 0.6.15      | Cross-Site Scripting vulnerability on uploaded cover file names. Thanks to @ibarrionuevo                           ||
 | V 0.6.15      | Creating public shelfs is now denied if user is missing the edit public shelf right. Thanks to @ibarrionuevo       ||
 | V 0.6.15      | Changed error message in case of trying to delete a shelf unauthorized. Thanks to @ibarrionuevo                    ||
-| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   ||
-| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               ||
-| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             ||
-| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                            ||
-| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            ||
-| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             ||
+| V 0.6.16      | JavaScript could get executed on authors page. Thanks to @alicaz                                                   |CVE-2022-0352|
+| V 0.6.16      | Localhost can no longer be used to upload covers. Thanks to @scara31                                               |CVE-2022-0339|
+| V 0.6.16      | Another case where public shelfs could be created without permission is prevented. Thanks to @nhiephon             |CVE-2022-0273|
+| V 0.6.16      | It's prevented to get the name of a private shelfs. Thanks to @nhiephon                                            |CVE-2022-0405|
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via an HTTP redirect. Thanks to @416e6e61                            |CVE-2022-0767|
+| V 0.6.17      | The SSRF Protection can no longer be bypassed via 0.0.0.0 and it's ipv6 equivalent. Thanks to @r0hanSH             |CVE-2022-0766|
 | V 0.6.18      | Possible SQL Injection is prevented in user table  Thanks to Iman Sharafaldin (Forward Security)                   ||
-| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                         ||
-| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley ||
+| V 0.6.18      | The SSRF protection no longer can be bypassed by IPV6/IPV4 embedding. Thanks to  @416e6e61                         |CVE-2022-0939|
+| V 0.6.18      | The SSRF protection no longer can be bypassed to connect to other servers in the local network. Thanks to @michaellrowley |CVE-2022-0990|
 
 
 ## Statement regarding Log4j (CVE-2021-44228 and related)

From 09b381101b8975b22df304e8d5d6069d66bb9784 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 16 Apr 2022 17:01:41 +0200
Subject: [PATCH 191/220] Added "None" to list of file formats, tags, series,
 languages Unified languages.html and list.html template

---
 cps/db.py                    |  31 +++++-
 cps/templates/languages.html |  35 -------
 cps/templates/list.html      |   4 +-
 cps/web.py                   | 194 ++++++++++++++++++++++++++---------
 4 files changed, 176 insertions(+), 88 deletions(-)
 delete mode 100644 cps/templates/languages.html

diff --git a/cps/db.py b/cps/db.py
index d2977e07..ff392274 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -903,9 +903,19 @@ class CalibreDB:
                     .join(books_languages_link).join(Books)\
                     .filter(self.common_filters(return_all_languages=return_all_languages)) \
                     .group_by(text('books_languages_link.lang_code')).all()
+            tags = list()
             for lang in languages:
-                lang[0].name = isoLanguages.get_language_name(get_locale(), lang[0].lang_code)
-            return sorted(languages, key=lambda x: x[0].name, reverse=reverse_order)
+                tag = Category(isoLanguages.get_language_name(get_locale(), lang[0].lang_code), lang[0].lang_code)
+                tags.append([tag, lang[1]])
+            # Append all books without language to list
+            if not return_all_languages:
+                no_lang_count = (self.session.query(Books)
+                                 .outerjoin(books_languages_link).outerjoin(Languages)
+                                 .filter(Languages.lang_code == None)
+                                 .filter(self.common_filters())
+                                 .count())
+                tags.append([Category(_("None"), "none"), no_lang_count])
+            return sorted(tags, key=lambda x: x[0].name, reverse=reverse_order)
         else:
             if not languages:
                 languages = self.session.query(Languages) \
@@ -977,3 +987,20 @@ def lcase(s):
         _log = logger.create()
         _log.error_or_exception(ex)
         return s.lower()
+
+
+class Category:
+    name = None
+    id = None
+    count = None
+
+    def __init__(self, name, cat_id):
+        self.name = name
+        self.id = cat_id
+        self.count = 1
+
+'''class Count:
+    count = None
+
+    def __init__(self, count):
+        self.count = count'''
diff --git a/cps/templates/languages.html b/cps/templates/languages.html
deleted file mode 100644
index c83398d5..00000000
--- a/cps/templates/languages.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "layout.html" %}
-{% block body %}
-  <h1>{{title}}</h1>
-  <div class="filterheader hidden-xs">
-    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-    <div id="asc" data-order="{{ order }}" data-id="{{ data }}" class="btn btn-primary {% if order == 1 %} active{% endif%}"><span class="glyphicon glyphicon-sort-by-alphabet"></span></div>
-    <div id="desc" data-id="{{ data }}" class="btn btn-primary{% if order == 0 %} active{% endif%}"><span class="glyphicon glyphicon-sort-by-alphabet-alt"></span></div>
-    {% if charlist|length %}
-    <div id="all" class="active btn btn-primary {% if charlist|length > 9 %}hidden-sm{% endif %}">{{_('All')}}</div>
-    {% endif %}
-    <div class="btn-group character {% if charlist|length > 9 %}hidden-sm{% endif %}" role="group">
-      {% for char in charlist%}
-      <div class="btn btn-primary char">{{char}}</div>
-      {% endfor %}
-    </div>
-  </div>
-  <div class="container">
-      <div div id="list" class="col-xs-12 col-sm-6">
-  {% for lang in languages %}
-      {% if loop.index0 == (loop.length/2)|int and loop.length > 20 %}
-      </div>
-      <div id="second" class="col-xs-12 col-sm-6">
-    {% endif %}
-    <div class="row" data-id="{{lang[0].name}}">
-        <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{lang[1]}}</span></div>
-        <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{{url_for('web.books_list', book_id=lang[0].lang_code, data=data, sort_param='stored')}}">{{lang[0].name}}</a></div>
-    </div>
-  {% endfor %}
-      </div>
-  </div>
-{% endblock %}
-{% block js %}
-<script src="{{ url_for('static', filename='js/filter_list.js') }}"></script>
-{% endblock %}
-
diff --git a/cps/templates/list.html b/cps/templates/list.html
index 71dbea11..ed59661e 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -14,7 +14,7 @@
       {% endif %}
       <div class="btn-group character {% if charlist|length > 9 %}hidden-sm{% endif %}" role="group">
         {% for char in charlist%}
-        <div class="btn btn-primary char">{{char.char}}</div>
+        <div class="btn btn-primary char">{{char[0]}}</div>
         {% endfor %}
       </div>
 
@@ -30,7 +30,7 @@
         <div id="second" class="col-xs-12 col-sm-6">
       {% endif %}
       <div class="row" {% if entry[0].sort %}data-name="{{entry[0].name}}"{% endif %} data-id="{% if entry[0].sort %}{{entry[0].sort}}{% else %}{% if entry.name %}{{entry.name}}{% else %}{{entry[0].name}}{% endif %}{% endif %}">
-        <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{entry.count}}</span></div>
+        <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{entry[1]}}</span></div>
         <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{% if entry.format %}{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry.format )}}{% else %}{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].id )}}{% endif %}">
           {% if entry.name %}
           <div class="rating">
diff --git a/cps/web.py b/cps/web.py
index e6ca4d03..ae4b12a8 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -307,10 +307,20 @@ def get_matching_tags():
     return json_dumps
 
 
-def generate_char_list(data_colum, db_link):
-    return (calibre_db.session.query(func.upper(func.substr(data_colum, 1, 1)).label('char'))
+def generate_char_list(entries): # data_colum, db_link):
+    char_list = list()
+    for entry in entries:
+        upper_char = entry[0].name[0].upper()
+        if upper_char not in char_list:
+            char_list.append(upper_char)
+    return char_list
+
+
+def query_char_list(data_colum, db_link):
+    results = (calibre_db.session.query(func.upper(func.substr(data_colum, 1, 1)).label('char'))
             .join(db_link).join(db.Books).filter(calibre_db.common_filters())
             .group_by(func.upper(func.substr(data_colum, 1, 1))).all())
+    return results
 
 
 def get_sort_function(sort_param, data):
@@ -526,36 +536,66 @@ def render_author_books(page, author_id, order):
 
 
 def render_publisher_books(page, book_id, order):
-    publisher = calibre_db.session.query(db.Publishers).filter(db.Publishers.id == book_id).first()
-    if publisher:
+    if book_id == '-1':
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
-                                                                db.Books.publishers.any(db.Publishers.id == book_id),
+                                                                db.Publishers.name == None,
                                                                 [db.Series.name, order[0][0], db.Books.series_index],
                                                                 True, config.config_read_column,
+                                                                db.books_publishers_link,
+                                                                db.Books.id == db.books_publishers_link.c.book,
+                                                                db.Publishers,
+                                                                db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
+                                                                db.Series)
+        publisher = _("None")
+    else:
+        publisher = calibre_db.session.query(db.Publishers).filter(db.Publishers.id == book_id).first()
+        if publisher:
+            entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                    db.Books,
+                                                                    db.Books.publishers.any(
+                                                                        db.Publishers.id == book_id),
+                                                                    [db.Series.name, order[0][0],
+                                                                     db.Books.series_index],
+                                                                    True, config.config_read_column,
+                                                                    db.books_series_link,
+                                                                    db.Books.id == db.books_series_link.c.book,
+                                                                    db.Series)
+            publisher = publisher.name
+        else:
+            abort(404)
+
+    return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
+                                 title=_(u"Publisher: %(name)s", name=publisher),
+                                 page="publisher",
+                                 order=order[1])
+
+
+def render_series_books(page, book_id, order):
+    if book_id == '-1':
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Series.name == None,
+                                                                [order[0][0]],
+                                                                True, config.config_read_column,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Publisher: %(name)s", name=publisher.name),
-                                     page="publisher",
-                                     order=order[1])
+        series_name = _("None")
     else:
-        abort(404)
-
-
-def render_series_books(page, book_id, order):
-    name = calibre_db.session.query(db.Series).filter(db.Series.id == book_id).first()
-    if name:
-        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
-                                                                db.Books,
-                                                                db.Books.series.any(db.Series.id == book_id),
-                                                                [order[0][0]],
-                                                                True, config.config_read_column)
-        return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Series: %(serie)s", serie=name.name), page="series", order=order[1])
-    else:
-        abort(404)
+        series_name = calibre_db.session.query(db.Series).filter(db.Series.id == book_id).first()
+        if series_name:
+            entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                    db.Books,
+                                                                    db.Books.series.any(db.Series.id == book_id),
+                                                                    [order[0][0]],
+                                                                    True, config.config_read_column)
+            series_name = series_name.name
+        else:
+            abort(404)
+    return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
+                                 title=_(u"Series: %(serie)s", serie=series_name), page="series", order=order[1])
 
 
 def render_ratings_books(page, book_id, order):
@@ -591,33 +631,61 @@ def render_formats_books(page, book_id, order):
 
 
 def render_category_books(page, book_id, order):
-    name = calibre_db.session.query(db.Tags).filter(db.Tags.id == book_id).first()
-    if name:
+    if book_id == '-1':
         entries, random, pagination = calibre_db.fill_indexpage(page, 0,
                                                                 db.Books,
-                                                                db.Books.tags.any(db.Tags.id == book_id),
+                                                                db.Tags.name == None,
                                                                 [order[0][0], db.Series.name, db.Books.series_index],
                                                                 True, config.config_read_column,
+                                                                db.books_tags_link,
+                                                                db.Books.id == db.books_tags_link.c.book,
+                                                                db.Tags,
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
-                                     title=_(u"Category: %(name)s", name=name.name), page="category", order=order[1])
+        tagsname = _("None")
     else:
-        abort(404)
+        tagsname = calibre_db.session.query(db.Tags).filter(db.Tags.id == book_id).first()
+        if tagsname:
+            entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                    db.Books,
+                                                                    db.Books.tags.any(db.Tags.id == book_id),
+                                                                    [order[0][0], db.Series.name,
+                                                                     db.Books.series_index],
+                                                                    True, config.config_read_column,
+                                                                    db.books_series_link,
+                                                                    db.Books.id == db.books_series_link.c.book,
+                                                                    db.Series)
+            tagsname = tagsname.name
+        else:
+            abort(404)
+    return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
+                                 title=_(u"Category: %(name)s", name=tagsname), page="category", order=order[1])
 
 
 def render_language_books(page, name, order):
     try:
-        lang_name = isoLanguages.get_language_name(get_locale(), name)
+        if name.lower() != "none":
+            lang_name = isoLanguages.get_language_name(get_locale(), name)
+        else:
+            lang_name = _("None")
     except KeyError:
         abort(404)
-
-    entries, random, pagination = calibre_db.fill_indexpage(page, 0,
-                                                            db.Books,
-                                                            db.Books.languages.any(db.Languages.lang_code == name),
-                                                            [order[0][0]],
-                                                            True, config.config_read_column)
+    if name == "none":
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Languages.lang_code == None,
+                                                                [order[0][0]],
+                                                                True, config.config_read_column,
+                                                                db.books_languages_link,
+                                                                db.Books.id == db.books_languages_link.c.book,
+                                                                db.Languages)
+    else:
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Books.languages.any(db.Languages.lang_code == name),
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", order=order[1])
 
@@ -880,7 +948,7 @@ def author_list():
         entries = calibre_db.session.query(db.Authors, func.count('books_authors_link.book').label('count')) \
             .join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(text('books_authors_link.author')).order_by(order).all()
-        char_list = generate_char_list(db.Authors.sort, db.books_authors_link)
+        char_list = query_char_list(db.Authors.sort, db.books_authors_link)
         # If not creating a copy, readonly databases can not display authornames with "|" in it as changing the name
         # starts a change session
         author_copy = copy.deepcopy(entries)
@@ -926,7 +994,14 @@ def publisher_list():
         entries = calibre_db.session.query(db.Publishers, func.count('books_publishers_link.book').label('count')) \
             .join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(text('books_publishers_link.publisher')).order_by(order).all()
-        char_list = generate_char_list(db.Publishers.name, db.books_publishers_link)
+        no_publisher_count = (calibre_db.session.query(db.Books)
+                           .outerjoin(db.books_publishers_link).outerjoin(db.Publishers)
+                           .filter(db.Publishers.name == None)
+                           .filter(calibre_db.common_filters())
+                           .count())
+        if no_publisher_count:
+            entries.append([db.Category(_("None"), "-1"), no_publisher_count])
+        char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
     else:
@@ -943,11 +1018,18 @@ def series_list():
         else:
             order = db.Series.sort.asc()
             order_no = 1
-        char_list = generate_char_list(db.Series.sort, db.books_series_link)
+        char_list = query_char_list(db.Series.sort, db.books_series_link)
         if current_user.get_view_property('series', 'series_view') == 'list':
             entries = calibre_db.session.query(db.Series, func.count('books_series_link.book').label('count')) \
                 .join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
                 .group_by(text('books_series_link.series')).order_by(order).all()
+            no_series_count = (calibre_db.session.query(db.Books)
+                            .outerjoin(db.books_series_link).outerjoin(db.Series)
+                            .filter(db.Series.name == None)
+                            .filter(calibre_db.common_filters())
+                            .count())
+            if no_series_count:
+                entries.append([db.Category(_("None"), "-1"), no_series_count])
             return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
@@ -976,6 +1058,12 @@ def ratings_list():
                                            (db.Ratings.rating / 2).label('name')) \
             .join(db.books_ratings_link).join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(text('books_ratings_link.rating')).order_by(order).all()
+        no_rating_count = (calibre_db.session.query(db.Books)
+                           .outerjoin(db.books_ratings_link).outerjoin(db.Ratings)
+                           .filter(db.Ratings.name == None)
+                           .filter(calibre_db.common_filters())
+                           .count())
+        entries.append([db.Category(_("None"), "-1"), no_rating_count])
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"Ratings list"), page="ratingslist", data="ratings", order=order_no)
     else:
@@ -997,6 +1085,12 @@ def formats_list():
                                            db.Data.format.label('format')) \
             .join(db.Books).filter(calibre_db.common_filters()) \
             .group_by(db.Data.format).order_by(order).all()
+        no_format_count = (calibre_db.session.query(db.Books).outerjoin(db.Data)
+                           .filter(db.Data.format == None)
+                           .filter(calibre_db.common_filters())
+                           .count())
+        if no_format_count:
+            entries.append([db.Category(_("None"), "-1"), no_format_count])
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"File formats list"), page="formatslist", data="formats", order=order_no)
     else:
@@ -1008,15 +1102,10 @@ def formats_list():
 def language_overview():
     if current_user.check_visibility(constants.SIDEBAR_LANGUAGE) and current_user.filter_language() == u"all":
         order_no = 0 if current_user.get_view_property('language', 'dir') == 'desc' else 1
-        char_list = list()
         languages = calibre_db.speaking_language(reverse_order=not order_no, with_count=True)
-        for lang in languages:
-            upper_lang = lang[0].name[0].upper()
-            if upper_lang not in char_list:
-                char_list.append(upper_lang)
-        return render_title_template('languages.html', languages=languages,
-                                     charlist=char_list, title=_(u"Languages"), page="langlist",
-                                     data="language", order=order_no)
+        char_list = generate_char_list(languages)
+        return render_title_template('list.html', entries=languages, folder='web.books_list', charlist=char_list,
+                                     title=_(u"Languages"), page="langlist", data="language", order=order_no)
     else:
         abort(404)
 
@@ -1034,7 +1123,14 @@ def category_list():
         entries = calibre_db.session.query(db.Tags, func.count('books_tags_link.book').label('count')) \
             .join(db.books_tags_link).join(db.Books).order_by(order).filter(calibre_db.common_filters()) \
             .group_by(text('books_tags_link.tag')).all()
-        char_list = generate_char_list(db.Tags.name, db.books_tags_link)
+        no_tag_count = (calibre_db.session.query(db.Books)
+                         .outerjoin(db.books_tags_link).outerjoin(db.Tags)
+                        .filter(db.Tags.name == None)
+                         .filter(calibre_db.common_filters())
+                         .count())
+        if no_tag_count:
+            entries.append([db.Category(_("None"), "-1"), no_tag_count])
+        char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
     else:

From c61e5d6ac03deaff00d1b4b85f2204ffb56c556b Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 17 Apr 2022 11:54:46 +0200
Subject: [PATCH 192/220] Fix amazon metadata-provider

---
 cps/metadata_provider/amazon.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index fef63669..7de0d415 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -113,9 +113,9 @@ class Amazon(Metadata):
                     except (AttributeError, TypeError):
                         match.cover = ""
                     return match, index
-            except Exception as e:
-                log.error_or_exception(e)
-                return
+                except Exception as e:
+                    log.error_or_exception(e)
+                    return
 
         val = list()
         if self.active:

From c92d65aad3ea4f2247e34c2d5c7946852959cbd8 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 17 Apr 2022 19:05:56 +0200
Subject: [PATCH 193/220] Catch more errors on import metadata provider

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

diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 4bbca58f..0070e78f 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -57,7 +57,7 @@ for f in modules:
         try:
             importlib.import_module("cps.metadata_provider." + a)
             new_list.append(a)
-        except ImportError as e:
+        except (ImportError, IndentationError, SyntaxError) as e:
             log.error("Import error for metadata source: {} - {}".format(a, e))
             pass
 

From 3cbbf6fa860f0e497794a808f84aac107f05bd75 Mon Sep 17 00:00:00 2001
From: xlivevil <xlivevil@aliyun.com>
Date: Mon, 18 Apr 2022 12:42:05 +0800
Subject: [PATCH 194/220] Update Simplifield Chinese translation

---
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        |  Bin 50015 -> 51107 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        | 1236 ++++++++--------
 messages.pot                                  | 1275 +++++++++--------
 3 files changed, 1280 insertions(+), 1231 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index d0ffc14cfa5de9b938d7fce5491833ef83bc8c9e..a2e59093ef91fea52df06200bc7adefc43ba2e1d 100644
GIT binary patch
delta 13491
zcmZ|VcX(A**2nRaK&T156W~%qk=_YXjM79<0^%UTB;+E2kU)wO5U(_8A|-^HC`F1O
zHBzL5sOX3|Dq;Z@NkRY%G7gSndB4BA*Ub3-F+TImXRm$E*?aA^_c=+N`SRIf8y6P~
zd{L=*w#Pp=Lp?7NbE+%)?>~{PJx^VAuq}4PhWI$%g$q&79mGm_-r^$k5r?($Jepn;
zY=RG4JRM7UUclQyV;C3q<HH!vEM0L7cEMZ>!;i5iUc{0Z+0OHdVIx$6O)(04VHq5U
z<uDDyaVA#5#i;vU3iby)?_C<Y@zY?3=M|wQ{3mLlJ7$UY?!Jmxo_-%Hfi|f7JD?Kj
zhLvy#>OMbeoD5W@p1}r~ixJH4ouHuy-ovVR8EfNDsLU&O@Vr{+L){mR<m3&)(m2EV
z7h(kQ3rK0bS5OPvhgI-2Cg7*23is$p{kzkcLgNA4hp||!ljq%!!*LXD#DN&v+4EZ9
zV62bRFt`$|MtlNwCN7{BQk?y(iM6l<cEGY2jTNwO7xrI!`3N1=@vo>-O~K+g3oGM1
zi*rzwS&ypBQS{+EsEKZ%o)2Sr+T#kSgu5We%S%8dn2p`=R9EWH;=JGJ2<{=h8lW4t
z#QU%rrlD4pi^DMwm2lZ;w>1q>aSyDC4`UsiWY?d!>n~e;616oK12k&WxPgtaB>SOK
zwZvN30afb3*c2yYBV2=h@i<n*l6SlNYN8T|MkO>1<8Y$I=TPHcMZLy>?`UYnm3p`d
z>!1!<7o;fO{ists2bD-RYVQu94%Hdd{g+UQ+{E4(%Dbvk-;1j3WYm^Di8`FKk;5AB
z7SZ59dTUVwzmL4)-euGSm3z5~e5lji5w-Fd)L~kPF}M=7=bxhvWihgd#3rZ&V~}Eb
z52MD-!g9>-t)rpLccBJ6iCXblBnR&jYT`Qgcph)0*8+7YN2BgfLmk!t>MfX!+Jd!M
z5BH(A@;qvRH?b~;kaYv*_k1+!V+?9<{HTGG%qggZW}^~ajyemQaR{En{@CDNSE(e_
zgfmd%<X~~!YVi(K1zy8INg8j`(1+wb)SiBV+M{n#hv+umh2`#ZZ$mVy)PB@`i%=C=
zfi-X&suHiGR{R-iD{i0?E7ix%*RT)u*90x;(Ccs?vKViu#j8*QZ9$dt7^-w%pkB-0
zP?d|~KorORs0jw4DwT*zXc{)e<*2PWh)V2(zSLi@-xWHv$A6$!64B4S@Ab{js0uxR
zI!wb+Z_RjADKk(L&O}YH95v2P)I_IHiGPSn@D^&p5dk(%14Uv9j6x063YAbV)BuA}
zTQeG!a60NtEV1kBP>Jlp(s&HD_h(Sge}tN_!2Hqr1H}fo_p=IWD{7%8YKJO)Uvm`t
zh%=B^+*@IuN8MlLe)mJE8L9#!QI&cEwV?T^1lFPw--aX{@D9<aL&sZK1`ALtzlnPA
zcT{C640MOCI<_S4iS2PB>TImXrg##Y;B~X&18)2-=EJD1NXNl?|FdZ5+kOT4kM}eG
zrA+${auYs`s>IXS60?zm?7fbSvGib9xz-p?+!vMjP;8E4u^BGKQg|43SWjaa=J(#F
zp@Ba_l``}}w`bL{Epb!qh9j^eW@B0W8;0QpjKE8%L~o#8x6p^&0_tIKD^UrLLRDxs
z1}f0lPNO0oK_&1W2Hy&dCH@1WFqW^42AYPtz6^DmcbacwG;uy^D}6kyt!sfwxE*Tc
zJ<OO`>aQF7(NP*>Q3F4Q<uMbL;C$2oYfy)8Ggia`<RE)Lp~mSw)b$TUZRsd1hv`@u
zXQ2+~N>t)|hEjhWzIW-+-d#t%1wUC_ewh1l8;O<Z?~VM9;SI%-xCmAHY*YdpQHk$F
zC43CEpm)qdR3f1dyWg;?1!xSXBObMqL#VwgPNxQ{kNSeOwRnKVBd{I)X~@qfZ!_vp
z7GZU4^@#g2_QAHq<FFU5L4657M^!fP2aOsuD*VMg*bMbRZ|sF>s8jnYs^mvel{kmm
zvaeAU_{REwK^@A75pJ(5V>99!s7l;}8fO$zv4A&;h7QRz<aZHoCh8EKKvm*bRDv}h
zbrZJ3YQ){KD#l_LOhoPV22=ujur(e)ZOv8GJhxC=^E1}h`yV#atvm{qSx?kicnCG%
zDAa%xu?nVPO`L~1I~!1E;RI@eGuQ&pVSBuTI`yp|a|`Hzy1xg8>izFSLz(tR?MWs^
z;sVqPw_tNTifyn6eOPl8<-~5-4X0yWJcyd`0_rSWL@ne;48>xj-Jvdl0d=&Xp+nIM
zHQ*3zh1nR5r;%5h-_PBOVo`^6E~>PDN1f`6s0G|aotcn0muMNY1=gp3AS$8cIO?xc
zJe`i-xEqzoE!0Y@#k;==`=a6(P+!V(SQme@IC6|TTm!HV{bNxT*@2z02vreZf=jG1
z>d>}I2)Ng*I~{u62HFiHu@SK!wXy}MGw}lI)Ne<vV4qz-jXFD@pek_P;ybAOBm8ch
z>ZppfK+V@FKw|)nKBx(nq7KmusKd6&JY?6;nHN!S#WmDn3LWd7FN4L2tD`20M4k31
z)cx%-xKOM^92iMM6HUchxY*)t*pT=*YA>%?|2L@nLLPTNL?SVYI0hTx1k{8}P!-9+
z61daieb|rqE$plJzrr||(IcqWY8<K(Gf|~qj3sd+D$(tB{RC<Y&Z3^Xh`RqaYQi#!
zF0P2$>&B@5_NWBAVYuG^J~T?v5sSKUB&u}dEzZEw#Ivv%F2b(36m`h{hDxx+csEWt
z3~m7`u}BQVPN?y_qqbmxWPWc14XtE6mc~p}rn9Vn0jeUaQ3GtY{#Q}=y^hWC9n{<O
zPt+DQo#6fwib0J#7M0K>)O-stphK{lh6Xx-y73rl!ZWB(?RnH*euLVA-?2SbPI9H}
zi`x5GR3)caJOi~Qn^7O4L*@sl1g|Gie+?Wq(Uq_|s&w^G{f$rqc0!e`Cn}-As4wGK
z)JmR0-M<ihn2SpE7%G7eQTJa(CGs2A#;VEGUmb0e-RsdGHBdZiqIA?i3sD)bv+IXZ
z1D?gQcm<W{_ozz#3p?T;s4eN3;{JjfhdMLa*bLtfSmPILO-G|i&Y`G1osCU#7dF68
ztp5(SAZ{|*4KxIO#808_&qXEjCTgqBS{#z<Dpm@0C<E1Ll%Y`vb&8u>+y*s3G?vGE
zus#mK#+Z&RaShhPGw8!2tca!4+}lzcBZ%vvwzj3&4oM*3b*7;b-i-sWKUToy*aJ7A
zGR?<Icpcl|Z`dANrMs<)N4=Jr*behh6)Z&ktf-jbez9qTT0lI8>HVKaLlt-)^?t8L
ztsvLjg{r_w^Y5q?Uq&Sw@`Sry36)p_R3&4v96oB-$D=Ab6?K+oU>)Z7a%ku@9>Q?^
z81=2bf_mUr^kK0l-GGfy3ADF37PZoN)XEp3&cF%O^Vd+nPuxUpMZ^^M$*zrop>)L1
z(8Q}ynQy{sxC8aTX;ei%!0MQf`cC|cO1wm-vjJ+4d!X)%F&{P4umk-IQHS|NCiPc|
zuF#>^=N4+O@1Q<RAyZvK^-$NNP!qI4CDakMb$wB1V+blSKkD^LK`mr8YGJ!k;~&IY
zcx)>5*Pee$hhC>kI0#EmbH4#Sf-2=)Y=XN{6J0=6<~mlve_>aQc*^znMIGv4sD$IJ
ze=KTC(ott;TEK324z-e{7U!T6TaQX$6RHC5p(=9$RpNhI95J0gWJ6d4s{i=Y?q6(P
zz(&O7Sg01*9`*catbu{)G#b)aVID&5(H9tnm7j4&qY@Z{_h1tC!Ck1=@V41}hFjq%
zRKMTi)#f_XxLc67CE%T-p~L6RbVi_Fw^~>qo1<Q<f!06WTx8~=p5I~dA=DXo2UY5i
z?E2>x7n$E<CB6T*gAE><<@PqxY>g_>J*W@Jqt-vwT!cz=9X7z-s6;-*+V~afto({C
zvHWb8(A}u}?v>2%J!BU~*#$r9!Bq6)9Mt=L13O{0IqtAMfGY7^^DuTN{@$+N^{lJl
zSkyx1nd?ytI)s5%G(M%F2}{j&KQ3!y3F6kMOgo`ow;1amh8l3BUC*%onHJBtcm>wv
zzFg}+fU3-CtcqXFrT&`eHXT~wZ`cHz&T}gpj4ItM?2UV{GyVhhT#NZG!FJe~xF_C)
zepG_XP_OfL)P%p76&AR-$pY%H3*G5ZW<yX9Cff~jQG1+g?y&1eQTKmr{kKrBUFbsh
zsjh{pY&5pU@u=^^8r1jVBh&}zT7ZTID*l`sz=sbJcR?kx0JYMMs4v+zi%;71GpMb(
zj5-Vdz;KLO<i7bGQ1L^kEgpqh@MJSEmxf-iT#Ul^Ft{aHj`%l=!=HEkm9aVfwNL}!
zhi!3)#j~+8@luO7p$_F<i@(Ph;$M;Z0$#7hZl&W;C7FTBGzazIF4RQdm_K6#afu~v
zYpS5GH^OLai+X+{w!vpmE8c^8?k&^;&trML{}*Yf)Zdt4OWo^H7d7zRs4W^`jz!%+
z)2^>Iw_<tv_n{_w!{QH7mA!()u<SD4eT>84@Bf==G@@faYQoP^85Wt}V@cxM7XNOB
zWx17xqwcSVI$TY#9!6vE!-e{iPDPEMgO%`Q4CvGzp-~P$vKy|TR(umxy71-h!3L<f
zHEMwSusuFv*PlbZ@2gQ2%0ngaE~)}IP_Jp_Y&TxlZ0fH8`_Q2QN17=ZNjwv);)~Y5
z50%&%RH^f=|3|ar3O7zI)Jj`oRqST*gXUwX`Nr#~o*L7wV+mFu-iXTlRn$NqnqQ$x
z{jK>U>iIi%z1&K7e{EEMQ&c6Qt$!#g@i>bo2dwe5xe)c>D%6eJt^crj27{*;wX%!m
zEmY}Ct#W6e0jkuUQCswwxfH7rzk!`GaFK=vs<PTm*c`RuZf0L|s2PV!Fd0kZ4C`NL
z{i{$3Zb$u8+>0&oyjg6Gt4LeqdcYe%L#KbDxeT?(2h0yqr}=vvh~?M11V>^Y;zU%X
zcB2m239N}l*cwA~+y|!}YMv)h*Vkh3@Be)?w4zg}0nVfL{x{SLBXiw~nqcryp{{pB
z4fGdO0%@q{XQ4{I9aZ8l?RxbW+&EFFaav(D&Yu@eqdE>jm2AAli?9aqCaj3ZunN9!
zae>7@VQu=uU)2Ai!J$KqGX*v7TGTjssQcbEi!h)}i?4IPe0D+YT?{J20TvH8N11-q
z^(3r|nHH}yH=)Mai*4{V)LV5OWAP5EvV+&N|0>;I*1HT7QSnUFmMk+j+4X~{75p8Q
zz_+Nw`-{aDHn=Zc9n=IpQ48#E@pRO4bFnNg-w<%6U1uG8u`(Bqp<a^@P^G_y8t4w{
z(6!#^e(F7eD(zO(fG1JUpT#nG88yx~*c6MsL{fMccEY3p4IQG5SPze4TfBt2vHT{t
zqQR(vCu1beK|QwtTi_AA2a8apZ?V}`rX6Yl{ZRcQP!)(X1Icz_nmH47isz$Nwg>gV
zJLUycY4cHg`yF<~dRyFK8-|*2BI>ySYMkd#Te=BV$%Dw&1-x%)l%OMYt9xHdqaN&v
z>hELm1E|9`0ySVJYVViX^{wVU)N`lo`rD|t;7inVKiTyPFY7+`zdDWjT&Ro6tQVHX
zbn|I*9%|rasFklq9oBbHiF}4y;Z4*Ruh=#>UR%_4KkB(@7>%!B4d(ZXXcWVc?e4}f
z)M2WPnlK7=Hd<Lc2%8fRLk;*0HpM*_e}?xHmwm<k%ckL|cp0j)U!W4dfq~LA?$FRg
zVLRN1BOHCitx=VE5cOaxMqvQE;uch5m$4a!>|}ee1*-p9)bpEB6*z+}@e9;egzuvM
zx}otdcVl1F9w(v_nukhovAG({6K_N%lxLnmO?cMgZ_QuKlDpmgRj@qw)i>Mj4!GB<
zHywJthM^`*M15-0ES`s&a2a;S7cIVkN;DsJ{|(dI<L<9&Hb5Q1)~NgYTK}Mcbv$Yv
z@n#C@{eH^g6{z=qBdU}qP%Hizb?9!RDpz{1o1iIbrLD0R_QZxb0^8uzsKXxEMMEpT
zf?DCXs0@EW4G@y&{vfGnj=@Uw@5A7pqVD^``oBXxAM&c}FNGSv25S5UsJ(BEj1%zs
z(a-~rqE;M_y74LNpKtLJGuPaP5!`pcd;`l6e`tPzn)n)O#s4rH?Q_o!!{Gn_XABJ`
zkcv8tnHH}_t!#t27poGVviK9!1VyOlZ=n+Z*(|Z&Jzp6s(%%quUq|eO-6iMGOQX>U
zx0&Zq1OJHnY4<xSky-~_g3VC_4Ma^CYyK5g+KH$wdKUHEYV3k9Tl_U@zFQd3K-CYr
z_qQ(U!G5Si^Qid*RwZ7FTFDmF#IK>Ae-o?WS?kY7jq?L)0mWZ)iTP0dUCn{7vH!YZ
zwB0bxE-W{<n1}58S&Iu%3H@ww`9p5t24+XB$@P8~$D0|b#OI+B&(^=~QX_|suDB8P
zg}Q_~G-VIlUZF~sX09@inqQ+<R`Q5TtQOWLZi9L)2VxDJV9vJw+<-NXpne8?jyi;2
zqRv3bQI~O9RH8L3u7|pQm-TnD{<~3?8GxGbuc!nvu^FzyT6hXIPv8;_mE;f9fZ@m7
zp{a(NunFpVOS7BV7yHpa)Z$$1NxTj9+;!{!0X6aO*ch80ca<81R65|r(a;Z-#i$z(
zpfbN~@h_;-Hag)3?u<&PhsF0>JOs<pKiW)2JvSY-(j}<p_M#Sg9HW@udz*$b{sDEv
zzs#_cF0O=i>91$@K$Y+@yFLX~@;Rt+)}j`$!LA>+_zdcGyo~zs{R6gSelPNrJ6r=$
z38bJ7&r=q!LOrkvWAJ^{KviCM6E;Fk*aFpmFY5FU#R`~=dTj%!iY!Gf=p_tj!q;ik
z!S~JY%<$80;^wFahM^`%N0o3k>iOqU39m&};DC9|uD^kr_ydaz%v-0azb^bihgMkW
z4R_<+s0kiK4LAa|!Z?ekq7s^c-Ekf23|%tA-gJB35;gu{)E32~5}tx>an766Un@F5
zhkls6g(dJjDuIg@7orCG)?)81H&96|L4OsqHtPG)z~To{i4Qj?p|)l|dX1aLr{qm;
zH7l&7FE%|cJtHma+xGW9kl;`9r~7>|aY>2sss5J3{qa$0zO>BbF}{Sj^tkxAG`}xB
z#Wyx3b&TH^=Np@ml;o~HnV3G#mzk20>bpNBKE*f0AD7@y&05l-L0)u+&#F8Y95yle
zabN5>f6`d*zSPu|RG&W~F<pJ}DJc`W`KC?(clVSr{xKQBE5nk9#HCtyVzMvQpBy*Q
z?;D$#<o6Lyic24-=kiAMpA=S+go5cz(EQ3c@6AD5!^#HJ8JaS|pWH2P;?OE(^FA3p
zIiy0|m@)pewEr$MYvt(Pc`<QYLI*sUnLaKh**7sIAtT8b6_@Zt%9yxxf0QpV&6k{#
z&a`RiaY;%31Ydjx5uJX20udGQjY)aJpXy6Uc``XEB`zT?>)M$2YR4t`c!271H6tk@
zI7XU3J(%{Z3By84#APsFYS!?vJ@OtHn_4{U;`j-bd}$fM{Is4-pK6!aW5VL_A>-nd
zgfBJm@p0*C+J}run#mWJph~7B$0fPikj%um^fYf+8u|RMhl1JWz4c_VkOmVI)6%pN
zll-Z{W=e8!bUO>$o~#p7YISrqOQIl2<5JSneJnYBoZlDhpbqIzrld~zQz2Y(c_*fn
z4JodD%PPvusu(;<{^a!3M1NXvWm)M{pNZ(uvTYY%+jiaBwQ13&OJ2ydCLtkh^O`=D
z9aeV7s>1afuP)eM_{@x~!!tT$jb2hB_P^WakM~_&GrM5PbA>xL6=v@)T(q;`P*(oo
zO$A2|70lb8fAIOjnOnKx&u7wCbbM{m`sWIEK36bjt9!Cw$;!O1XOyZOUNCRnwbd`>
zzqYyXh5cDyEw9$IaOM7jxreSTUmZN2h4Z)YWbjP>=Yn@_?xKRFM+=rLD%|l>(ScnB
z$7bu^!WDD#5AV<Gm|Zfg#=mpX!Tj^IdEM6Z`v2!M^Tk$W@<O-8gk)`d`H{SPw$}{p
zoPTg((b1y?yJuX>-B56R&b9T2wH`a9g<IDb<gWbFAuY_=R<Lt^(Z)GhBX*pPytZmi
z(XPX;c!ew173O6Z?L2n%=+5BbYqE1lNa=#z&*mS^DSBp3*4bVC^G@$NSv+g~t7+v6
z4(u(Qx1?afi>@Gf5&L?D7Ne9|4;~mP^L8Ehx>WzG%eNNJJ5acHePPc0!rWQcRximv
zxFG+?x`H|T^AE3Z6)0SHq~OS6?|<GJTvy(b6XiliGp-x!Kf7>s&mtD<hW7q*xoGF{
zYb$pa=DbpnvpfIb;li9lh4WUp@aoZ}R}bgd1_y_B8R_Ay^(SwKEm?GR%kHe*r?T5m
ho9=U)e{KD1SJ&<=+OXYC>-~A*Y@{#$;5L`N_kUk86_5Y`

delta 12496
zcmYM)3w+OI|Htt!8?nt{!!W1ca%RIEVu;Kkrj%F-VP;r1r%gHkRxyVp^>a*4G33lI
zAvqMf-RLAzR3vkZa(72}MgP}(*XQy0_qZST^ZH!h@AtYs*XO#v->u#E>eoZg=Y{xx
zhzecc@lQcf&#Q`^Dk}Q_e=-|+p1QIy0jFb4+=X#?4)t7##-102wNY^^^kE9}AMXYJ
zs}8QU_){$5d4BI6jT9~vZ{m4RV}DG<AhyDrSPbhhdwYz-2QU*uFb9?3c&v-_FbsEN
zX*`4xcoNIwdDMOXE$sJ`ZBut+ebkMuP!o1W4b<Iy8Z}@lmch}e1aeXLPeUa#8>8?Y
z)O|Zq;~YU%<_mlfZ(=Ft_sTYN4^+nr#0gjhA4MgUhA}uAqwrPaS#LR(#4oM?98yy6
z7An!Zs1+A)?kZXZ+Y+bX<M<}}d(pT+qdPWl;duiv7azm(*bw6$^1N8=gUWm&M&mM!
z!}m~$|A>|GE*8hgmYx@mm9Q+<LTz0OtcVY{WdBu~6gon25SGJqizlEeF%?ybx6p^{
zP!k<RJ%16kr#DdvSK#1qY`hMr1jk})T!G}~okeX~WFqy~02MiL@%SLt$0t!MnuyQf
zJgkUUQCp$W6j#B@*bJ-T;~0Y@P}lP;UXI$5J*Wj8#oBnuPeY{&YvUe_M3p)Y>tPS9
zg)icx_%=r3CDeU)Pzh9GV>Mw@OvPl2H=)KqjCyU4qZa%N#-RUC8ah-J9(ISM9_rK%
zMolmlwRiKeJm#bB{{WT9r`Q3{qe>my&Xu+YYRh_~4rMBq!sn6W=8Z?j^?RFX@G5%y
zQ4jozn&=+tfhb;jt=xw?OvAAw=Aia`H|kJcz^WMXh)d9itj%kN8h12m3#OnFpM&Ad
z?=7dH6>mVs@IF9I{3r4Tc_mn$4rN<Z0#Bk2Yk!Q!RMZxX#~S!1s<b;$mHQN{;}57r
z?_n(ZlGqyN_mXI6;BICLDxp+VrejcN;T3!eH(@vY2UV$VltU8^K#em2mEd%XXQL{x
z5FfzRsPD!`^lN~fG_*&@P>1L%jKdqKx1mxeSL!6xeb1vRl8u#c2C5P(Q7hhs+KQv7
z#0pRodY#?)VW_Qmuru{%4lltv#-Rq9hAQP!RO$Aj5;==1U1%4#!aAr48lo!I1(i@A
ztchb#TeAR_*jB892T@!6T^H)Fm0YJo@B4kTJSR>WH$a{C=BU@^QB*0PLQOajHNhCv
zIIp56T7gP@8!ExiQ7gWV8s~pl97FwG-9X`}jH;mqXo%XHwy2DIqRvE?U7vzVWG*Vv
zrKr8nx9i(c6Mk%dY5f<l82z_VTkXF~qdAQ--CXHAA#a}7&wLA&$hX)OZ=qHko9rsn
z233h3s0jz55*>v~(2vz{4u;_d)IxV6&-uMWG*pVySQo#;cnt0CUcaWOvoI9vVIJ1O
zt>)LL3GSIy9&@En#3$(QgWB5l_&DxIB^p6cSMPrn8ai|xF&_IO=ggalwed4lss4)*
z7}3M6xH2{%Ziw~qX)J-c7>ctn4Ci7zE<tVWzc2y6!Pd<0g^^|p?2O?!3AINvuoS+A
zN^mLawc3HI)aTZJ7nNw~CtYQlqbBNy+L}z%7EVQ-r2zKAt?1W4AwAs$4N*5FVc`eG
zoPcfUpO0G67pN^ehf4S&YQ?wA-%$7cfh947ua?Fwg=Mflmc_)UsJ{kCrbCDBX^g}L
z$T{=Yp$58b{ePqOvNY+J##*S?t{Li3K8i{_6?G;iqqgiV)E2I@_yE=-KGBQ%N71-V
zM=K2N?LLtYqe|Zyl|V04<^xbG8EMYOa>Q$q^XGkl&tUNsw}1htEnAOz{s`&=b=u-v
ze(Si8O}S9<Y4_ta8FdKfpfW#+`tn`J1dL#oN3b30OXo+GbTw*%_pl;<in_l5AHj-!
z+#&6Qs<c0qhANPa+N(U&%I8`Ca@1kmj@sj0sMG!-suGt`0~LMNRjNGdY}7!0CGhH?
z&dv~2C01f3+=tBP_r9hPO~(bSfOoMKmg?*FxC<(Q6l{$BP+RgUYNCaxGqem<p?6U$
zKaNW5C)64E9d%}k_H*M!VtKv)6=_uFLLBPQbioI32x@{%Y>3&|3|F8k@fE6K-=OZl
zh(+-_D$$#$EveSut-KLxf!(nIreYJl|8r>ga3As`-TMJsW9)P8OV%GX;Uv_`a#1T;
zjGAyA>NIb#_;b{mIEfnX4mQHX0d6aXBQKJ-2K`#mT^il6;Xqf~amYFIa#5%I3~D7e
zP+z#e(TBwbIqRTG|0pW44AfyBj~#F$DxsU$1S3<ONvYIdpT=xDs^cnDd=RVPE$o6}
zgIz^>VoTyVsEQm$CG>C9p*@Lu%`TX~+I26@Rj4FtL5)ynA}P)9_V5Whl=-uE!*JB$
znT%TbT#Hwr_Ix{PpuMQW_&I9gv#5cuqt4D<ERXliazotpdS(kh4ZRLYs6*7xE~H^7
z@o3Zp<4~tO7j^#})P(t{33g%(9<#UrYZCv7s!;WGcVAu9eQmK0`k$epp8->`7Oq82
zbR1QIGpLnZv-nr+N?dfP`?b6~Dv<!{En1DLz&=!kj-eLz11izWcKt7;;(o8hF!x|Z
z)B_1v96MY57;0|^S^r2>g5yvVy@XofT-1GwP!-F!cpGZV_G1Vh#Y8-Tt@ZvFAMP^j
zfEuV9hT>DG6+MH+a13gK7f~yoZZ1HboqW_p@1Yj3-};ZB5<P`_{zvQo1q*-wzfYq9
z7m8)L*QN<-kJ9i#oQfrJ6)K^Ps0oi?H9Uoy@IP1*|A(3|<azgHEsNU9x~MHk#Aet7
z{VL_lG_?0~u>=OODt>7F-=enWKI#J$HNx2dHE<F>fW1+b>u>$3sPVE<6`PFu)XzbE
z30IGx{#wZ%IyBHx^x;`lrhlO(E}Q8dsD(<PHR}8Dl*J=aZ$%zzoE4~vwxh;5imK@M
zcKr`j0%2L~e>e?amdi8_Rmv9F0^6d#WMeT7^RYFa#QIojq_ZV9CQdcqzy`!0VLkjA
zwUre{x&BtzkT}gxLj%2zKHP(P;4CVUkkM|h!ccKLERCH}hq5<@VPDi1q+6VYx_>;D
zK|jXg>sTANW4!v$(5OM9*cg{UZBz-npk9|gSPJ{2_V#&m6e@unR0StuGUj1f{1V&Y
zMbv$<W8Lo=b+HL?Yvd66y%99DS1VBO<@?wae?^tBX14p;&;t{QvrsEofg1P-sshJR
z34e`|c-H(GRe}3v=^VG<>R49qe>)nw;R#e`15u@%hbr}AyS@%p(p{*-v>)~QeTzDb
zcQFFXjdO?5hq^xzefS7!yi`=hM=NH2ZypV;bOmbV$53bB9%_I(FSyq+9<>$8SQq<X
zZ_Gtad>WPbMU2MlsQZh&=qgeM_4dS~z7vV)SLPjQ$bqOmo`e-K*IaCFL#^N_>b*XL
z+JXzHN?b-I5IWvnk3fxA0ktJDsI7{_C~P^N`YV%UI`kIwMrA$~HP8ao1j|q*Uya)1
z{n!XUMpf!I*1?zwZr~26mG{Q-I2aT0MeE;=I<yBSP=6(GoDOAr8nwc+cH=eF7TiUh
z>ieks%1m@CDUXV4pc1QvN~j*HLOoHH>1&S1KoNdv#ftPd@K1Jskxar`bWA{f7?z_R
zJcgC<D%QjzQ=GN2IdM1CS(s|BMNRw}CgB<Ef-zIwcO=zZfLfUU-`4Skb%at8T?j`F
z9EFANE9#JqFvp|bn(3$y%L3GWyR84J`G;8|*F9ee^;~VF@_w%c4Nce{H9;4PdzpPv
zhb7g_F=v=>p(?Z)tK%oA`wPrJP!oo~<UYYwQ1i6IDtiCB)6fIMFdiqO5?YVCajV52
zT6_p~{}-s&_9uJ@OTX+6S!ZlU>^FnhmiUTYul0(n*Z{1={9djaxCFI=9jMd&C2AsX
zn)@kO4wYD4RAP-#uT>lCe;hSVZ@Zpl{Sz&I$>O<Knfn%?zi@>#^!|T{74RF>M7K~Y
z{2l9{Z@OFAqo_(v!VdT@w!|B#=W6D;1RG#&;+7bP&!G~WjXiL69`)CR|Di*cnBlB$
zHb*6vjCydW_4`qKy1>l0>pM~Re`fvHQLovb=)<U)uCmRrG4bG;)IX8Nn{?<yaROuT
zN7O)nqXwuni+35Dpb~i*i{nz%2kRY+_t^D=sIB=Hbrx=*DqUl?`;^C_;%<H#+T*8D
z7058vuh(e-*2Pay6W&67pnkVF^i|g%jt%IKLJj;dCSbC~ld&A}EQ^<+4yAvCbzH%Y
zbo>`JVXHZArGrovnSe@kKI*}B7=f3}+o(_Oebm-OyymV~#WuwCQO~EN7B(JPu-|)^
zMkzWDpjP-PYJgLyQeQIfq27+@xo+SVs4Yq|2cYhsXx9VgO4N9pu@vsJ_&65+{qG!&
z6fT6k&j0#}&!Qe!j<s+LYNcPH61-qu!3T(MS$xO5hgxaqJa>OZ)Y+<zHLw|KA-ynG
z@BdgDnqWTa!Bwb3_a2tU6L$R^YQ<MkXC?Fv_goAru8Vs9Vbq~}(ymWKz3*?JDzp)m
zz+o)>``=GA^qz*l=>|+d4cHDfU~h96RwbT@y1vNzH=`0eh-L6Q>;KvO$BYWN@oS@=
zZyI3#weqfZAqAs|2b<%}nOK(orKrp|p`JT#euLVY0`q6oIKSET;`818<xu@TR3)0t
zr~Vq~F*=m_vvy;K`GWZh>cM%a`&L_j&^(BRhZnW7Q`jD_V|i?_z->u;GaL2YSm&pq
zPv?HDfOk+6L@acPRW<9I51AcN2|bA=G0pn3tbZaZq1W(1oR9Ii%Pc@uz+Y~WyCDvB
z+Mh6UP<y(>+=)89U*cnU8&$b>i`_36-BF3ZiTZxLgF1A_urXdjeP7Biar5*+uKT?y
zG&Im6)QZ-i2H1t#>+`4;-bbyd#9QwEGN|iSQ4_a8J=YzZVK%nJb$0zc>iJ(#^WDK{
z=J!IDy4NiRRjQ^Ir(h-GER4iF)Lt&Oc(cU^unPUB@Cp1CHO?b%yK&P{<4i)`H{aZb
z&6wXiK_d*kWiG>TREAL&*D&jt@pipAssbG>9%N>rRyq-z;7h2tX9xDeL#T>YTu%K}
zx>y>@FaZ@Oqqd^2nPt~=Q7c%2N^mFY(0*+3HyBG?fSTZe6>cjcQE_L~b5CG6_FqB$
zRodZnl*5S_jdM}``KZ0zg<bFlCScQ*F5w}lfu^9IpM|RAGSoQhu^t}4_IMQ^!g{OR
z;T*Wi?@sjuIyCSS)Q!h67Q^3h1IJ@k;tp6D2Vg@Sk4d-&Rq`vSirhjiAau3sk4CM$
zn%ThmTl%fh4t07vqqZUo^+28(K$UPMYEL&{3p|GvF>;NYus-U!HmGsBqP8*>RmmJw
zg6mNU`}fmmOydaZ!Qbsd(R>$|#Om}%qXuk&8lZ<=A7YL{4LH@VPe&!T6!l!tuAeZ!
zLMrU{&eBk3f1_5|WUaHc*$Fjp57f$2P=_=RmB>QW3OAv?a0gK1-L&hm>)dlKu?_vh
zQ3<WV5WWBVXlS61P>1OZ7RR5k241%~Y`yyxD-xARTh!sovUnkOC;k_<#&YkvxCg4T
zZ((0thgv|<4J?%Ty(k)*uqr-?HPMG%P=|0BYJgc-7Z+k8?nfo~2iC_*8(o})dTuak
zVbf5Rc?-4jqjvpA^y|iuO>U2CqY~+aC9%7ig35RxM&KxOGAe;t7Qbu0ZyqwgKt2Dx
zc@y=z-rGd|)rj2eCajJ6#5T6L6GjmCF#Dkr9FDqglsV0=FEQ7m4qp&;|8eU-Y4LfB
zFK?#)n&3A&^j>>gTpWWcU0u`)A4VOr=TL9MXw<;3qgJ*MV{k3j#E(#CqyTjoqqn*R
zCZp!-je0)SPooTt;n*F=V^2JcnlO5sOQb&PzV@j8Cr|?nw*Cy%mQ6rS@Cs_L=b`R@
z7j^%KsD&Ov-RJ+_E?l>c+va^Ue7pO#xsq82!+5Z{*&a1<GB&~9=5#DY{63b(!>9zl
zLY=v@F7|tW)6mL7b~wwSN?+6BMAQV`Py_TrW!~2uhI&2+BXJt)zJ;i7{W9|u)*=oM
zI-6igz5gjR^iyphYM@D|3|~bJv>7$wd*(-|(td_fcm?&`pV$h+-g9wB)P%iI<BUhm
z<H!2A6!q5??+6VYo^Q<GP%A0D(@pF{4G@p|sn*>3yQ325gBo}QDzO>XztRla^-t{j
zMeF|y{TiV3`);6E)Bw#bejF<h53=|LbC&rw>M(7!_}}JtsEYl9O8jp#WS9GJg<(AX
zopw=w9h$LpJcO%JB|B^WW7gX3`n#bL9*IiqCDh6np<c@%R>G6!4eJlx<F41l5UwYo
zwz$h4>aW8!oDO9?7L~Ez;yl##fb}o4{xzrswxcHe7b<}ZsJ;CMwWakxa1(VxjXxAM
zUN-8?O!3pugs<5R^UYP}7VOIPy%vY=b-$oQqMqxC8n_Q?;&iNyucIop6IJS?sGl8o
zQ1?~;&?WBgN<$r~s0Us}4ZIvRaK6PmEZ&29pFc5Aqn^8jD(PL+bCvhGmDWK`+ypgl
zAJp}MPQRCF9TQL`%ro;bhWM~uKaVQ;&!~Zl?sqFFi5l=hiyNa#+Z7vNA5;ZiL7lDb
zsQbUh!oUChWF7yY9*8*L{!OJN7Jd&<6TXVt>o=``BUUEfi)HaN>b1R$s>mN$9m5a0
z2^(NF;+AHL^wW_|LleD$IvlG|8E(WXxEqzgDf1la`bE@4zgS%KBiCOB)n660pvD&W
zMU9_@8t+B)YeiG7V-aevmYbhoEb%SWfMq{+TTl~~Kq4k!7t{jAV=0`8nrI<vqLmh}
zGq+p+-jDfzc52{{t>ZLm;O{KHX8wxW!@CyOKIFC{4z&fH4+Ucy&n_0&(fr}S+!kTM
z0WHp!Z<IbHBPV0zFyG)&qejH}MrWp{W~ckohNq{E@MVq~HZ&tM-8Xd9Sl^KJoYaiW
z?7(x$)q`&*XA}#@Jh`S=@K{Q@@aV@1A4yG1OV7^srKM(O3?7>v|6*Xk;10p>2aPEb
z%pbg}XyA?XPlJ<(K2;>5aKwy}zR{^U!-HpsZ3wNb>9c*El6)E2zLBGHe9w%{$VpEf
zoS7cT%^VdB%gT!gT%B+)@WQAvfl-tGQ!Qg;c1~($X8I6sWNKErrzg@zjU1XWY~0xN
zA%XPCfk4?Q6G|n-C$#W2No<{v*sw`LaN(3XMT#^D?wh)xSYY6^rop?@{)!5eSRB!;
zV8#d6<}dl>!#P*C?z+4>_wtJT%Zu_04lKI7aK@#*?_b)Re|7Gzg4Y*b-MaS5-n>f(
zR$YE+Yan)Ubnv;w_d<g?%i0wS?tdpfEYNUEzu=8c9g75KZHX=#IJ50U@Zk2IMH*b%
zJNIJl+qLUuk4>weeKB|0wHdD!ys@uf-fNe3e^7W~NP2co;gw*A;7_4}?en4o)pt(_
zZr+_(H0090m4Ry?^q0Y|doPv<<{U0nq_FqGkvo-l?I_qX>+0(19;01Zx6Ql!_J(WI
rU%RqzOW@om3t}$MoL4Y=MZwIK*OsjDO`77nw0pyq`Rgyw+~xfrFNI^&

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 73bc4efa..1f7099cf 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-15 09:19+0100\n"
+"POT-Creation-Date: 2022-04-18 12:20+0800\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: xlivevil <xlivevil@aliyun.com>\n"
 "Language: zh_CN\n"
@@ -16,578 +16,581 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
-#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
-msgid "not installed"
-msgstr "未安装"
-
-#: cps/about.py:47 cps/about.py:63
-msgid "installed"
-msgstr "已安装"
-
-#: cps/about.py:145
+#: cps/about.py:86
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:144
+#: cps/admin.py:141
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:146
+#: cps/admin.py:143
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:154
+#: cps/admin.py:151
 msgid "Reconnect successful"
 msgstr "重新连接成功"
 
-#: cps/admin.py:157
+#: cps/admin.py:154
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
-#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
-#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
-#: cps/uploader.py:103
+#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
+#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
+#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:188
+#: cps/admin.py:197
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:207
+#: cps/admin.py:217
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:244
+#: cps/admin.py:255
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:277 cps/templates/admin.html:50
+#: cps/admin.py:289 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr "管理用户"
 
-#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
 #: cps/templates/list.html:13
 msgid "All"
 msgstr "全部"
 
-#: cps/admin.py:343 cps/admin.py:1615
+#: cps/admin.py:360 cps/admin.py:1648
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:357
+#: cps/admin.py:374
 msgid "{} users deleted successfully"
 msgstr "成功删除 {} 个用户"
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/admin.py:397 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr "显示全部"
 
-#: cps/admin.py:400 cps/admin.py:406
+#: cps/admin.py:418 cps/admin.py:424
 msgid "Malformed request"
 msgstr "格式错误的请求"
 
-#: cps/admin.py:418 cps/admin.py:1493
+#: cps/admin.py:436 cps/admin.py:1526
 msgid "Guest Name can't be changed"
 msgstr "访客名称无法更改"
 
-#: cps/admin.py:430
+#: cps/admin.py:448
 msgid "Guest can't have this role"
 msgstr "游客无法拥有此角色"
 
-#: cps/admin.py:442 cps/admin.py:1451
+#: cps/admin.py:460 cps/admin.py:1484
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:446 cps/admin.py:460
+#: cps/admin.py:464 cps/admin.py:478
 msgid "Value has to be true or false"
 msgstr "值必须是 true 或 false"
 
-#: cps/admin.py:448
+#: cps/admin.py:466
 msgid "Invalid role"
 msgstr "无效角色"
 
-#: cps/admin.py:452
+#: cps/admin.py:470
 msgid "Guest can't have this view"
 msgstr "游客无法拥有此视图"
 
-#: cps/admin.py:462
+#: cps/admin.py:480
 msgid "Invalid view"
 msgstr "无效视图"
 
-#: cps/admin.py:465
+#: cps/admin.py:483
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr "游客的本地化是自动侦测而无法设置的"
 
-#: cps/admin.py:469
+#: cps/admin.py:487
 msgid "No Valid Locale Given"
 msgstr "无可用本地化"
 
-#: cps/admin.py:480
+#: cps/admin.py:498
 msgid "No Valid Book Language Given"
 msgstr "无有效书籍语言"
 
-#: cps/admin.py:482
+#: cps/admin.py:500 cps/editbooks.py:1267
 msgid "Parameter not found"
 msgstr "参数未找到"
 
-#: cps/admin.py:533
+#: cps/admin.py:553
 msgid "Invalid Read Column"
 msgstr "无效的阅读列"
 
-#: cps/admin.py:539
+#: cps/admin.py:559
 msgid "Invalid Restricted Column"
 msgstr "无效的限制列"
 
-#: cps/admin.py:560 cps/admin.py:1323
+#: cps/admin.py:579 cps/admin.py:1355
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:572
+#: cps/admin.py:591
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您确定删除Kobo Token吗？"
 
-#: cps/admin.py:574
+#: cps/admin.py:593
 msgid "Do you really want to delete this domain?"
 msgstr "您确定要删除此域吗？"
 
-#: cps/admin.py:576
+#: cps/admin.py:595
 msgid "Do you really want to delete this user?"
 msgstr "您确定要删除此用户吗？"
 
-#: cps/admin.py:578
+#: cps/admin.py:597
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
-#: cps/admin.py:580
+#: cps/admin.py:599
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr "您确定要修改选定用户的本地化设置吗？"
 
-#: cps/admin.py:582
+#: cps/admin.py:601
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr "您确定要修改选定用户的可见书籍语言吗？"
 
-#: cps/admin.py:584
+#: cps/admin.py:603
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定角色吗？"
 
-#: cps/admin.py:586
+#: cps/admin.py:605
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定限制吗？"
 
-#: cps/admin.py:588
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr "您确定要修改选定用户的选定可视化限制吗？"
 
-#: cps/admin.py:590
+#: cps/admin.py:610
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr "您确定要更改所选用户的书架同步行为吗？"
 
-#: cps/admin.py:592
+#: cps/admin.py:612
 msgid "Are you sure you want to change Calibre library location?"
 msgstr "您确定要更改 Calibre 库位置吗？"
 
-#: cps/admin.py:594
+#: cps/admin.py:614
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
-msgstr ""
+msgstr "您确定要删除 Calibre-Web 的同步数据库以强制与您的 Kobo Reader 进行完全同步吗"
 
-#: cps/admin.py:743
+#: cps/admin.py:764
 msgid "Tag not found"
 msgstr "标签未找到"
 
-#: cps/admin.py:755
+#: cps/admin.py:776
 msgid "Invalid Action"
 msgstr "无效的动作"
 
-#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr "拒绝"
 
-#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr "允许"
 
-#: cps/admin.py:913
+#: cps/admin.py:936
 msgid "{} sync entries deleted"
-msgstr ""
+msgstr "{} 同步项目被删除"
 
-#: cps/admin.py:1036
+#: cps/admin.py:1059
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:1081
+#: cps/admin.py:1104
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:1087
+#: cps/admin.py:1110
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:1117
+#: cps/admin.py:1140
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:1123
+#: cps/admin.py:1146
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr "请输入一个LDAP服务账号和密码 "
 
-#: cps/admin.py:1126
+#: cps/admin.py:1149
 msgid "Please Enter a LDAP Service Account"
 msgstr "请输入一个LDAP服务账号"
 
-#: cps/admin.py:1131
+#: cps/admin.py:1154
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1133
+#: cps/admin.py:1156
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:1137
+#: cps/admin.py:1160
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:1139
+#: cps/admin.py:1162
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:1146
+#: cps/admin.py:1169
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP成员用户过滤器需要有一个“%s”格式标识符"
 
-#: cps/admin.py:1148
+#: cps/admin.py:1171
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP成员用户过滤器中有不匹配的括号"
 
-#: cps/admin.py:1155
+#: cps/admin.py:1178
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CA证书、证书或密钥位置无效，请输入正确的路径"
 
-#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1521
-#: cps/admin.py:1590 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:279 cps/shelf.py:341 cps/shelf.py:376 cps/shelf.py:451
-msgid "Settings DB is not Writeable"
-msgstr "设置数据库不可写入"
-
-#: cps/admin.py:1208
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr "数据库路径无效，请输入正确的路径"
-
-#: cps/admin.py:1223
-msgid "DB is not Writeable"
-msgstr "数据库不可写入"
-
-#: cps/admin.py:1235
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr "密钥文件路径无效，请输入正确的路径"
-
-#: cps/admin.py:1239
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr "证书文件路径无效，请输入正确的路径"
-
-#: cps/admin.py:1346
-msgid "Database Settings updated"
-msgstr "数据库设置已更新"
-
-#: cps/admin.py:1354
-msgid "Database Configuration"
-msgstr "数据库配置"
-
-#: cps/admin.py:1370 cps/web.py:1479
-msgid "Please fill out all fields!"
-msgstr "请填写所有字段！"
-
-#: cps/admin.py:1378
-msgid "E-mail is not from valid domain"
-msgstr "邮箱不在有效域中"
-
-#: cps/admin.py:1384 cps/admin.py:1543
-msgid "Add new user"
-msgstr "添加新用户"
-
-#: cps/admin.py:1395
-#, python-format
-msgid "User '%(user)s' created"
-msgstr "用户“%(user)s”已创建"
-
-#: cps/admin.py:1401
-msgid "Found an existing account for this e-mail address or name."
-msgstr "使用此邮箱或用户名的账号已经存在。"
-
-#: cps/admin.py:1430
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr "用户“%(nick)s”已删除"
-
-#: cps/admin.py:1432 cps/admin.py:1433
-msgid "Can't delete Guest User"
-msgstr "无法删除游客用户"
-
-#: cps/admin.py:1436
-msgid "No admin user remaining, can't delete user"
-msgstr "管理员账户不存在，无法删除用户"
-
-#: cps/admin.py:1509 cps/admin.py:1634
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr "编辑用户 %(nick)s"
-
-#: cps/admin.py:1513
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr "用户“%(nick)s”已更新"
-
-#: cps/admin.py:1517 cps/admin.py:1649 cps/web.py:1504 cps/web.py:1564
-msgid "An unknown error occurred. Please try again later."
-msgstr "发生一个未知错误，请稍后再试。"
-
-#: cps/admin.py:1552 cps/templates/admin.html:98
-msgid "Edit E-mail Server Settings"
-msgstr "编辑邮件服务器设置"
-
-#: cps/admin.py:1571
-msgid "Gmail Account Verification Successful"
-msgstr "G-Mail账号校验成功"
-
-#: cps/admin.py:1597
-#, python-format
-msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
-
-#: cps/admin.py:1600
-#, python-format
-msgid "There was an error sending the Test e-mail: %(res)s"
-msgstr "发送测试邮件时出错：%(res)s"
-
-#: cps/admin.py:1602
-msgid "Please configure your e-mail address first..."
-msgstr "请先配置您的邮箱地址..."
-
-#: cps/admin.py:1604
-msgid "E-mail server settings updated"
-msgstr "邮件服务器设置已更新"
-
-#: cps/admin.py:1646
-#, python-format
-msgid "Password for user %(user)s reset"
-msgstr "用户 %(user)s 的密码已重置"
-
-#: cps/admin.py:1652 cps/web.py:1444
-msgid "Please configure the SMTP mail settings first..."
-msgstr "请先配置SMTP邮箱设置..."
-
-#: cps/admin.py:1663
-msgid "Logfile viewer"
-msgstr "日志文件查看器"
-
-#: cps/admin.py:1729
-msgid "Requesting update package"
-msgstr "正在请求更新包"
-
-#: cps/admin.py:1730
-msgid "Downloading update package"
-msgstr "正在下载更新包"
-
-#: cps/admin.py:1731
-msgid "Unzipping update package"
-msgstr "正在解压更新包"
-
-#: cps/admin.py:1732
-msgid "Replacing files"
-msgstr "正在替换文件"
-
-#: cps/admin.py:1733
-msgid "Database connections are closed"
-msgstr "数据库连接已关闭"
-
-#: cps/admin.py:1734
-msgid "Stopping server"
-msgstr "正在停止服务器"
-
-#: cps/admin.py:1735
-msgid "Update finished, please press okay and reload page"
-msgstr "更新完成，请点击确定并刷新页面"
-
-#: cps/admin.py:1736 cps/admin.py:1737 cps/admin.py:1738 cps/admin.py:1739
-#: cps/admin.py:1740 cps/admin.py:1741
-msgid "Update failed:"
-msgstr "更新失败："
-
-#: cps/admin.py:1736 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
-msgid "HTTP Error"
-msgstr "HTTP错误"
-
-#: cps/admin.py:1737 cps/updater.py:387 cps/updater.py:599
-msgid "Connection error"
-msgstr "连接错误"
-
-#: cps/admin.py:1738 cps/updater.py:389 cps/updater.py:601
-msgid "Timeout while establishing connection"
-msgstr "建立连接超时"
-
-#: cps/admin.py:1739 cps/updater.py:391 cps/updater.py:603
-msgid "General error"
-msgstr "一般错误"
-
-#: cps/admin.py:1740
-msgid "Update file could not be saved in temp dir"
-msgstr "更新文件无法保存在临时目录中"
-
-#: cps/admin.py:1741
-msgid "Files could not be replaced during update"
-msgstr "更新期间无法替换文件"
-
-#: cps/admin.py:1765
-msgid "Failed to extract at least One LDAP User"
-msgstr "未能提取至少一个LDAP用户"
-
-#: cps/admin.py:1810
-msgid "Failed to Create at Least One LDAP User"
-msgstr "未能创建至少一个LDAP用户"
-
-#: cps/admin.py:1823
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr "错误：%(ldaperror)s"
-
-#: cps/admin.py:1827
-msgid "Error: No user returned in response of LDAP server"
-msgstr "错误：在LDAP服务器的响应中没有返回用户"
-
-#: cps/admin.py:1860
-msgid "At Least One LDAP User Not Found in Database"
-msgstr "数据库中没有找到至少一个LDAP用户"
-
-#: cps/admin.py:1862
-msgid "{} User Successfully Imported"
-msgstr "{} 用户被成功导入"
-
-#: cps/converter.py:30
-msgid "not configured"
-msgstr "未配置"
-
-#: cps/converter.py:32
-msgid "Execution permissions missing"
-msgstr "缺少执行权限"
-
-#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
-#, python-format
-msgid "Custom Column No.%(column)d is not existing in calibre database"
-msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
-
-#: cps/editbooks.py:300 cps/editbooks.py:302
-msgid "Book Format Successfully Deleted"
-msgstr "书籍格式已成功删除"
-
-#: cps/editbooks.py:309 cps/editbooks.py:311
-msgid "Book Successfully Deleted"
-msgstr "书籍已成功删除"
-
-#: cps/editbooks.py:361
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
-#: cps/web.py:1744 cps/web.py:1811
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
-
-#: cps/editbooks.py:410
-msgid "edit metadata"
-msgstr "编辑元数据"
-
-#: cps/editbooks.py:458
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
-
-#: cps/editbooks.py:494 cps/editbooks.py:958
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr "'%(langname)s' 不是一种有效语言"
-
-#: cps/editbooks.py:634 cps/editbooks.py:985
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
-
-#: cps/editbooks.py:638 cps/editbooks.py:989
-msgid "File to be uploaded must have an extension"
-msgstr "要上传的文件必须具有扩展名"
-
-#: cps/editbooks.py:650
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr "创建路径 %(path)s 失败(权限拒绝)。"
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr "保存文件 %(file)s 失败。"
-
-#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
+#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
+#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
+#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
+#: cps/web.py:1742
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:678
+#: cps/admin.py:1235
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr "数据库路径无效，请输入正确的路径"
+
+#: cps/admin.py:1253
+msgid "DB is not Writeable"
+msgstr "数据库不可写入"
+
+#: cps/admin.py:1266
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr "密钥文件路径无效，请输入正确的路径"
+
+#: cps/admin.py:1270
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr "证书文件路径无效，请输入正确的路径"
+
+#: cps/admin.py:1378
+msgid "Database Settings updated"
+msgstr "数据库设置已更新"
+
+#: cps/admin.py:1386
+msgid "Database Configuration"
+msgstr "数据库配置"
+
+#: cps/admin.py:1402 cps/web.py:1557
+msgid "Please fill out all fields!"
+msgstr "请填写所有字段！"
+
+#: cps/admin.py:1410
+msgid "E-mail is not from valid domain"
+msgstr "邮箱不在有效域中"
+
+#: cps/admin.py:1416 cps/admin.py:1576
+msgid "Add new user"
+msgstr "添加新用户"
+
+#: cps/admin.py:1427
+#, python-format
+msgid "User '%(user)s' created"
+msgstr "用户“%(user)s”已创建"
+
+#: cps/admin.py:1433
+msgid "Found an existing account for this e-mail address or name."
+msgstr "使用此邮箱或用户名的账号已经存在。"
+
+#: cps/admin.py:1463
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr "用户“%(nick)s”已删除"
+
+#: cps/admin.py:1465 cps/admin.py:1466
+msgid "Can't delete Guest User"
+msgstr "无法删除游客用户"
+
+#: cps/admin.py:1469
+msgid "No admin user remaining, can't delete user"
+msgstr "管理员账户不存在，无法删除用户"
+
+#: cps/admin.py:1542 cps/admin.py:1667
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr "编辑用户 %(nick)s"
+
+#: cps/admin.py:1546
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr "用户“%(nick)s”已更新"
+
+#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
+msgid "An unknown error occurred. Please try again later."
+msgstr "发生一个未知错误，请稍后再试。"
+
+#: cps/admin.py:1585 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr "编辑邮件服务器设置"
+
+#: cps/admin.py:1604
+msgid "Gmail Account Verification Successful"
+msgstr "G-Mail账号校验成功"
+
+#: cps/admin.py:1630
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr "发送给%(email)s的测试邮件已进入队列。请检查任务结果"
+
+#: cps/admin.py:1633
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr "发送测试邮件时出错：%(res)s"
+
+#: cps/admin.py:1635
+msgid "Please configure your e-mail address first..."
+msgstr "请先配置您的邮箱地址..."
+
+#: cps/admin.py:1637
+msgid "E-mail server settings updated"
+msgstr "邮件服务器设置已更新"
+
+#: cps/admin.py:1679
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr "用户 %(user)s 的密码已重置"
+
+#: cps/admin.py:1685 cps/web.py:1522
+msgid "Please configure the SMTP mail settings first..."
+msgstr "请先配置SMTP邮箱设置..."
+
+#: cps/admin.py:1696
+msgid "Logfile viewer"
+msgstr "日志文件查看器"
+
+#: cps/admin.py:1762
+msgid "Requesting update package"
+msgstr "正在请求更新包"
+
+#: cps/admin.py:1763
+msgid "Downloading update package"
+msgstr "正在下载更新包"
+
+#: cps/admin.py:1764
+msgid "Unzipping update package"
+msgstr "正在解压更新包"
+
+#: cps/admin.py:1765
+msgid "Replacing files"
+msgstr "正在替换文件"
+
+#: cps/admin.py:1766
+msgid "Database connections are closed"
+msgstr "数据库连接已关闭"
+
+#: cps/admin.py:1767
+msgid "Stopping server"
+msgstr "正在停止服务器"
+
+#: cps/admin.py:1768
+msgid "Update finished, please press okay and reload page"
+msgstr "更新完成，请点击确定并刷新页面"
+
+#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
+#: cps/admin.py:1773 cps/admin.py:1774
+msgid "Update failed:"
+msgstr "更新失败："
+
+#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+msgid "HTTP Error"
+msgstr "HTTP错误"
+
+#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+msgid "Connection error"
+msgstr "连接错误"
+
+#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+msgid "Timeout while establishing connection"
+msgstr "建立连接超时"
+
+#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+msgid "General error"
+msgstr "一般错误"
+
+#: cps/admin.py:1773
+msgid "Update file could not be saved in temp dir"
+msgstr "更新文件无法保存在临时目录中"
+
+#: cps/admin.py:1774
+msgid "Files could not be replaced during update"
+msgstr "更新期间无法替换文件"
+
+#: cps/admin.py:1798
+msgid "Failed to extract at least One LDAP User"
+msgstr "未能提取至少一个LDAP用户"
+
+#: cps/admin.py:1843
+msgid "Failed to Create at Least One LDAP User"
+msgstr "未能创建至少一个LDAP用户"
+
+#: cps/admin.py:1856
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr "错误：%(ldaperror)s"
+
+#: cps/admin.py:1860
+msgid "Error: No user returned in response of LDAP server"
+msgstr "错误：在LDAP服务器的响应中没有返回用户"
+
+#: cps/admin.py:1893
+msgid "At Least One LDAP User Not Found in Database"
+msgstr "数据库中没有找到至少一个LDAP用户"
+
+#: cps/admin.py:1895
+msgid "{} User Successfully Imported"
+msgstr "{} 用户被成功导入"
+
+#: cps/converter.py:30
+msgid "not installed"
+msgstr "未安装"
+
+#: cps/converter.py:31
+msgid "Execution permissions missing"
+msgstr "缺少执行权限"
+
+#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
+
+#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
+#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
+#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+msgid "None"
+msgstr "无"
+
+#: cps/editbooks.py:295 cps/editbooks.py:297
+msgid "Book Format Successfully Deleted"
+msgstr "书籍格式已成功删除"
+
+#: cps/editbooks.py:304 cps/editbooks.py:306
+msgid "Book Successfully Deleted"
+msgstr "书籍已成功删除"
+
+#: cps/editbooks.py:358
+msgid "You are missing permissions to delete books"
+msgstr "您没有删除书籍的权限"
+
+#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
+#: cps/web.py:1825 cps/web.py:1870
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
+
+#: cps/editbooks.py:408
+msgid "edit metadata"
+msgstr "编辑元数据"
+
+#: cps/editbooks.py:457
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr "%(seriesindex)s 不是一个有效的数值，忽略"
+
+#: cps/editbooks.py:493 cps/editbooks.py:1001
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr "'%(langname)s' 不是一种有效语言"
+
+#: cps/editbooks.py:634
+msgid "User has no rights to upload additional file formats"
+msgstr "用户没有权限上传其他文件格式"
+
+#: cps/editbooks.py:639 cps/editbooks.py:1029
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
+
+#: cps/editbooks.py:643 cps/editbooks.py:1033
+msgid "File to be uploaded must have an extension"
+msgstr "要上传的文件必须具有扩展名"
+
+#: cps/editbooks.py:655
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr "创建路径 %(path)s 失败(权限拒绝)。"
+
+#: cps/editbooks.py:660
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr "保存文件 %(file)s 失败。"
+
+#: cps/editbooks.py:683
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:814
+#: cps/editbooks.py:697 cps/editbooks.py:809
+msgid "User has no rights to upload cover"
+msgstr "用户没有权限上传封面"
+
+#: cps/editbooks.py:828
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:848
+#: cps/editbooks.py:869
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:861
-msgid "Error editing book, please check logfile for details"
-msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
+#: cps/editbooks.py:887
+msgid "Error editing book: {}"
+msgstr "编辑书籍时出错: {}"
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:951
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:997
+#: cps/editbooks.py:1041
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:1016
+#: cps/editbooks.py:1061
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:1063
+#: cps/editbooks.py:1117
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:1088
+#: cps/editbooks.py:1143
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1151
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:1100
+#: cps/editbooks.py:1155
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -600,174 +603,190 @@ msgstr "Google Drive 设置未完成，请尝试停用并再次激活Google云
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/helper.py:77
+#: cps/helper.py:81
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "找不到id为 %(book)d 的书籍的 %(format)s 格式"
 
-#: cps/helper.py:83 cps/tasks/convert.py:73
+#: cps/helper.py:87 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "Google Drive %(fn)s 上找不到 %(format)s"
 
-#: cps/helper.py:88
+#: cps/helper.py:92
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "找不到 %(format)s：%(fn)s"
 
-#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
+#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
+#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "此邮件已经通过Calibre-Web发送。"
 
-#: cps/helper.py:109
+#: cps/helper.py:113
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web测试邮件"
 
-#: cps/helper.py:110
+#: cps/helper.py:114
 msgid "Test e-mail"
 msgstr "测试邮件"
 
-#: cps/helper.py:127
+#: cps/helper.py:131
 msgid "Get Started with Calibre-Web"
 msgstr "开启Calibre-Web之旅"
 
-#: cps/helper.py:132
+#: cps/helper.py:136
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "用户注册电子邮件：%(name)s"
 
-#: cps/helper.py:143 cps/helper.py:149
+#: cps/helper.py:147 cps/helper.py:153
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "转换 %(orig)s 到 %(format)s 并发送到Kindle"
 
-#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
+#: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "发送 %(format)s 到Kindle"
 
-#: cps/helper.py:216 cps/tasks/convert.py:90
+#: cps/helper.py:220 cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr "%(book)s发送到Kindle"
 
-#: cps/helper.py:221
+#: cps/helper.py:225
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取请求的文件。可能有错误的权限设置？"
 
-#: cps/helper.py:313
+#: cps/helper.py:353
+msgid "Read status could not set: {}"
+msgstr "阅读状态无法设置: {}"
+
+#: cps/helper.py:376
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 
-#: cps/helper.py:319
+#: cps/helper.py:382
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr "删除书籍 %(id)s失败：%(message)s"
 
-#: cps/helper.py:330
+#: cps/helper.py:393
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr "仅从数据库中删除书籍 %(id)s，数据库中的书籍路径无效： %(path)s"
 
-#: cps/helper.py:385
+#: cps/helper.py:458
 #, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "将标题从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "将作者从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
 
-#: cps/helper.py:400
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "从“%(src)s”重命名为“%(dest)s”失败，出错信息：%(error)s"
-
-#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
+#: cps/helper.py:529 cps/helper.py:538
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Google Drive上找不到文件 %(file)s"
 
-#: cps/helper.py:464
+#: cps/helper.py:572
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "将标题从“%(src)s”改为“%(dest)s”时失败，出错信息：%(error)s"
+
+#: cps/helper.py:592
+msgid "Error in rename file in path: {}"
+msgstr "重命名此路径: {}文件时出错"
+
+#: cps/helper.py:610
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Google Drive上找不到书籍路径 %(path)s"
 
-#: cps/helper.py:504 cps/web.py:1659
+#: cps/helper.py:651 cps/web.py:1737
 msgid "Found an existing account for this e-mail address"
 msgstr "使用此邮箱的账号已经存在。"
 
-#: cps/helper.py:512
+#: cps/helper.py:659
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/helper.py:522
+#: cps/helper.py:669
 msgid "Invalid e-mail address format"
 msgstr "无效的邮件地址格式"
 
-#: cps/helper.py:595
+#: cps/helper.py:754
+msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
+msgstr "下载封面必须的 Python 模块'advocate' 未安装"
+
+#: cps/helper.py:767
 msgid "Error Downloading Cover"
 msgstr "下载封面时出错"
 
-#: cps/helper.py:598
+#: cps/helper.py:770
 msgid "Cover Format Error"
 msgstr "封面格式出错"
 
-#: cps/helper.py:608
+#: cps/helper.py:773
+msgid "You are not allowed to access localhost or the local network for cover uploads"
+msgstr "您没有访问本地主机或本地网络进行封面上传"
+
+#: cps/helper.py:783
 msgid "Failed to create path for cover"
 msgstr "创建封面路径失败"
 
-#: cps/helper.py:624
+#: cps/helper.py:799
 msgid "Cover-file is not a valid image file, or could not be stored"
 msgstr "封面文件不是有效的图片文件，或者无法存储"
 
-#: cps/helper.py:635
+#: cps/helper.py:810
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
 msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件"
 
-#: cps/helper.py:648
+#: cps/helper.py:822
 msgid "Invalid cover file content"
 msgstr "封面文件内容无效"
 
-#: cps/helper.py:652
+#: cps/helper.py:826
 msgid "Only jpg/jpeg files are supported as coverfile"
 msgstr "仅将jpg、jpeg文件作为封面文件"
 
-#: cps/helper.py:704
+#: cps/helper.py:878
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar执行文件"
 
-#: cps/helper.py:715
+#: cps/helper.py:889
 msgid "Error excecuting UnRar"
 msgstr "执行UnRar时出错"
 
-#: cps/helper.py:763
+#: cps/helper.py:937
 msgid "Waiting"
 msgstr "等待中"
 
-#: cps/helper.py:765
+#: cps/helper.py:939
 msgid "Failed"
 msgstr "失败"
 
-#: cps/helper.py:767
+#: cps/helper.py:941
 msgid "Started"
 msgstr "已开始"
 
-#: cps/helper.py:769
+#: cps/helper.py:943
 msgid "Finished"
 msgstr "已完成"
 
-#: cps/helper.py:771
+#: cps/helper.py:945
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/kobo_auth.py:127
-msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+#: cps/kobo_auth.py:128
+msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
 
-#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
+#: cps/kobo_auth.py:154
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
@@ -776,7 +795,7 @@ msgstr "Kobo 设置"
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
@@ -837,163 +856,163 @@ msgstr "Google Oauth 错误，请重试。"
 msgid "Google Oauth error: {}"
 msgstr "Google Oauth 错误: {}"
 
-#: cps/opds.py:384
+#: cps/opds.py:298
 msgid "{} Stars"
 msgstr "{} 星"
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
+#: cps/remotelogin.py:62 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
 msgid "Login"
 msgstr "登录"
 
-#: cps/remotelogin.py:77 cps/remotelogin.py:111
+#: cps/remotelogin.py:74 cps/remotelogin.py:108
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/remotelogin.py:86 cps/remotelogin.py:119
+#: cps/remotelogin.py:83 cps/remotelogin.py:116
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/remotelogin.py:95
+#: cps/remotelogin.py:92
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/render_template.py:39 cps/web.py:416
+#: cps/render_template.py:41 cps/web.py:407
 msgid "Books"
 msgstr "书籍"
 
-#: cps/render_template.py:41
+#: cps/render_template.py:43
 msgid "Show recent books"
 msgstr "显示最近书籍"
 
-#: cps/render_template.py:42 cps/templates/index.xml:25
+#: cps/render_template.py:44 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr "热门书籍"
 
-#: cps/render_template.py:44
+#: cps/render_template.py:46
 msgid "Show Hot Books"
 msgstr "显示热门书籍"
 
-#: cps/render_template.py:46 cps/render_template.py:51
+#: cps/render_template.py:48 cps/render_template.py:53
 msgid "Downloaded Books"
 msgstr "下载历史"
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:50 cps/render_template.py:55
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
-#: cps/render_template.py:58 cps/templates/user_table.html:161
+#: cps/render_template.py:60 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
-#: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:676
+#: cps/render_template.py:61 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:729
 msgid "Read Books"
 msgstr "已读书籍"
 
-#: cps/render_template.py:61
+#: cps/render_template.py:63
 msgid "Show read and unread"
 msgstr "显示阅读状态"
 
-#: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:679
+#: cps/render_template.py:65 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:732
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/render_template.py:65
+#: cps/render_template.py:67
 msgid "Show unread"
 msgstr "显示未读"
 
-#: cps/render_template.py:66
+#: cps/render_template.py:68
 msgid "Discover"
 msgstr "发现"
 
-#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/render_template.py:70 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
-#: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1041
+#: cps/render_template.py:71 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1135
 msgid "Categories"
 msgstr "分类"
 
-#: cps/render_template.py:71 cps/templates/user_table.html:158
+#: cps/render_template.py:73 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr "显示分类选择"
 
-#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/render_template.py:74 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
 msgid "Series"
 msgstr "丛书"
 
-#: cps/render_template.py:74 cps/templates/user_table.html:157
+#: cps/render_template.py:76 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr "显示丛书选择"
 
-#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/render_template.py:77 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr "作者"
 
-#: cps/render_template.py:77 cps/templates/user_table.html:160
+#: cps/render_template.py:79 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr "显示作者选择"
 
-#: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:925
+#: cps/render_template.py:81 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:1006
 msgid "Publishers"
 msgstr "出版社"
 
-#: cps/render_template.py:81 cps/templates/user_table.html:163
+#: cps/render_template.py:83 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr "显示出版社选择"
 
-#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/render_template.py:84 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1018
+#: cps/web.py:1108
 msgid "Languages"
 msgstr "语言"
 
-#: cps/render_template.py:85 cps/templates/user_table.html:155
+#: cps/render_template.py:87 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr "显示语言选择"
 
-#: cps/render_template.py:86 cps/templates/index.xml:104
+#: cps/render_template.py:88 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr "评分"
 
-#: cps/render_template.py:88 cps/templates/user_table.html:164
+#: cps/render_template.py:90 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr "显示评分选择"
 
-#: cps/render_template.py:89 cps/templates/index.xml:112
+#: cps/render_template.py:91 cps/templates/index.xml:112
 msgid "File formats"
 msgstr "文件格式"
 
-#: cps/render_template.py:91 cps/templates/user_table.html:165
+#: cps/render_template.py:93 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:93 cps/web.py:703
+#: cps/render_template.py:95 cps/web.py:755
 msgid "Archived Books"
 msgstr "归档书籍"
 
-#: cps/render_template.py:95 cps/templates/user_table.html:166
+#: cps/render_template.py:97 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:97 cps/web.py:780
+#: cps/render_template.py:100 cps/web.py:837
 msgid "Books List"
 msgstr "书籍列表"
 
-#: cps/render_template.py:99 cps/templates/user_table.html:168
+#: cps/render_template.py:102 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr "显示书籍列表"
 
@@ -1017,7 +1036,7 @@ msgstr "此书籍已被添加到书架：%(sname)s"
 
 #: cps/shelf.py:126
 msgid "You are not allowed to add a book to the shelf"
-msgstr "你没有向书架添加书籍的权限"
+msgstr "您没有向书架添加书籍的权限"
 
 #: cps/shelf.py:144
 #, python-format
@@ -1041,267 +1060,270 @@ msgstr "此书已从书架 %(sname)s 中删除"
 
 #: cps/shelf.py:218
 msgid "Sorry you are not allowed to remove a book from this shelf"
-msgstr "抱歉，你没有从这个书架删除书籍的权限"
+msgstr "抱歉，您没有从这个书架删除书籍的权限"
 
 #: cps/shelf.py:228 cps/templates/layout.html:140
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/shelf.py:237
+#: cps/shelf.py:236
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr "对不起，您没有编辑这个书架的权限"
 
-#: cps/shelf.py:239
+#: cps/shelf.py:238
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/shelf.py:249
+#: cps/shelf.py:248
 msgid "Sorry you are not allowed to create a public shelf"
-msgstr "抱歉，你没有创建公开书架的权限"
+msgstr "抱歉，您没有创建公开书架的权限"
 
-#: cps/shelf.py:266
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:269
+#: cps/shelf.py:268
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:283
+#: cps/shelf.py:282
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/shelf.py:305
+#: cps/shelf.py:304
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr "公共书架：%(title)s已经存在已经存在。"
 
-#: cps/shelf.py:316
+#: cps/shelf.py:315
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr "私有书架：%(title)s已经存在已经存在。"
 
 #: cps/shelf.py:337
-#, fuzzy
-msgid "Shelf successfully deleted"
-msgstr "书籍已成功删除"
+msgid "Error deleting Shelf"
+msgstr "删除书架时出错"
 
-#: cps/shelf.py:386
+#: cps/shelf.py:339
+msgid "Shelf successfully deleted"
+msgstr "书架已成功删除"
+
+#: cps/shelf.py:389
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/shelf.py:456
+#: cps/shelf.py:461
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架：%(name)s"
 
-#: cps/shelf.py:460
+#: cps/shelf.py:465
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
 msgid "Unexpected data while reading update information"
 msgstr "读取更新信息时出现意外数据"
 
-#: cps/updater.py:410 cps/updater.py:521
+#: cps/updater.py:433 cps/updater.py:545
 msgid "No update available. You already have the latest version installed"
 msgstr "无可用更新。您已经安装了最新版本"
 
-#: cps/updater.py:428
+#: cps/updater.py:451
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "有新的更新。单击下面的按钮以更新到最新版本。"
 
-#: cps/updater.py:446
+#: cps/updater.py:469
 msgid "Could not fetch update information"
 msgstr "无法获取更新信息"
 
-#: cps/updater.py:456
+#: cps/updater.py:479
 msgid "Click on the button below to update to the latest stable version."
 msgstr "点击下面按钮更新到最新稳定版本。"
 
-#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 
-#: cps/updater.py:507
+#: cps/updater.py:531
 msgid "No release information available"
 msgstr "无可用发布信息"
 
-#: cps/templates/index.html:5 cps/web.py:440
+#: cps/templates/index.html:5 cps/web.py:434
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:471
+#: cps/web.py:470
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:507
+#: cps/web.py:501
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:539
+#: cps/web.py:534
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:554
+#: cps/web.py:570
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:569
+#: cps/web.py:598
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:582
+#: cps/web.py:610
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:597
+#: cps/web.py:626
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:615
+#: cps/web.py:663
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:631
+#: cps/web.py:690
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
+#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1077
+#: cps/web.py:807 cps/web.py:1164
 msgid "Search"
 msgstr "搜索"
 
-#: cps/templates/admin.html:16 cps/web.py:903
+#: cps/templates/admin.html:16 cps/web.py:979
 msgid "Downloads"
 msgstr "下载次数"
 
-#: cps/web.py:980
+#: cps/web.py:1068
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:1001
+#: cps/web.py:1095
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1215
+#: cps/web.py:1286
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1222
+#: cps/web.py:1293
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1244
+#: cps/web.py:1315
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1246
+#: cps/web.py:1317
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1248
+#: cps/web.py:1319
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr "阅读状态 = %(status)s"
 
-#: cps/web.py:1353
+#: cps/web.py:1425
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr "搜索自定义列时出错，请重启 Calibre-Web"
 
-#: cps/web.py:1449
+#: cps/web.py:1527
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1453
+#: cps/web.py:1531
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1455
+#: cps/web.py:1533
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1472
+#: cps/web.py:1550
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
-#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
-#: cps/web.py:1515
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
+#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
+#: cps/web.py:1593
 msgid "Register"
 msgstr "注册"
 
-#: cps/web.py:1507
+#: cps/web.py:1585
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1510
+#: cps/web.py:1588
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1524
+#: cps/web.py:1602
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1543
+#: cps/web.py:1621
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1549
+#: cps/web.py:1627
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1553 cps/web.py:1578
+#: cps/web.py:1631 cps/web.py:1656
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1560
+#: cps/web.py:1638
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1566
+#: cps/web.py:1644
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1573
+#: cps/web.py:1651
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1639 cps/web.py:1688
+#: cps/web.py:1717 cps/web.py:1766
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1655
+#: cps/web.py:1733
 msgid "Profile updated"
 msgstr "资料已更新"
 
@@ -1309,36 +1331,36 @@ msgstr "资料已更新"
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr "找不到包含 OAuth 信息的有效 gmail.json 文件"
 
-#: cps/tasks/convert.py:137
+#: cps/tasks/convert.py:154
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/tasks/convert.py:163
+#: cps/tasks/convert.py:187
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:167
+#: cps/tasks/convert.py:191
 msgid "Ebook converter failed with unknown error"
 msgstr "发生未知错误，书籍转换失败"
 
-#: cps/tasks/convert.py:177
+#: cps/tasks/convert.py:201
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/tasks/convert.py:199
+#: cps/tasks/convert.py:223
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
-#: cps/tasks/convert.py:222
+#: cps/tasks/convert.py:246
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:245
+#: cps/tasks/convert.py:269
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
@@ -1393,7 +1415,7 @@ msgid "Edit"
 msgstr "编辑书籍"
 
 #: cps/templates/admin.html:25 cps/templates/book_edit.html:16
-#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
@@ -1403,179 +1425,179 @@ msgstr "删除数据"
 msgid "Public Shelf"
 msgstr "公共书架"
 
-#: cps/templates/admin.html:51
+#: cps/templates/admin.html:53
 msgid "Add New User"
 msgstr "添加新用户"
 
-#: cps/templates/admin.html:53
+#: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr "导入LDAP用户"
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:62
 msgid "E-mail Server Settings"
 msgstr "SMTP邮件服务器设置"
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr "SMTP主机名"
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:71 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:75 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr "加密"
 
-#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:79 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr "SMTP用户名"
 
-#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/admin.html:83 cps/templates/admin.html:94
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr "发件人邮箱"
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:90
 msgid "E-Mail Service"
 msgstr "电子邮件服务"
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
 msgstr "通过Oauth2的Gmail"
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:106
 msgid "Configuration"
 msgstr "配置"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Calibre Database Directory"
 msgstr "Calibre 数据库路径"
 
-#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:113 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr "日志级别"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "External Port"
 msgstr "扩展端口"
 
-#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr "每页书籍数"
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:133
 msgid "Uploads"
 msgstr "上传"
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:137
 msgid "Anonymous Browsing"
 msgstr "匿名浏览"
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:141
 msgid "Public Registration"
 msgstr "开放注册"
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:145
 msgid "Magic Link Remote Login"
 msgstr "魔法链接远程登录"
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:149
 msgid "Reverse Proxy Login"
 msgstr "反向代理登录"
 
-#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:154 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr "反向代理头部名称"
 
-#: cps/templates/admin.html:157
+#: cps/templates/admin.html:159
 msgid "Edit Calibre Database Configuration"
 msgstr "编辑Calibre数据库配置"
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
 msgstr "编辑基本配置"
 
-#: cps/templates/admin.html:159
+#: cps/templates/admin.html:161
 msgid "Edit UI Configuration"
 msgstr "编辑界面配置"
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:166
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:167
 msgid "Download Debug Package"
 msgstr "下载Debug包"
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:168
 msgid "View Logs"
 msgstr "查看日志文件"
 
-#: cps/templates/admin.html:169
+#: cps/templates/admin.html:171
 msgid "Reconnect Calibre Database"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:170
+#: cps/templates/admin.html:172
 msgid "Restart"
 msgstr "重启"
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:173
 msgid "Shutdown"
 msgstr "停止"
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:178
 msgid "Update"
 msgstr "更新"
 
-#: cps/templates/admin.html:180
+#: cps/templates/admin.html:182
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:181
+#: cps/templates/admin.html:183
 msgid "Details"
 msgstr "详情"
 
-#: cps/templates/admin.html:187
+#: cps/templates/admin.html:189
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:194
+#: cps/templates/admin.html:196
 msgid "Check for Update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:197
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:208
+#: cps/templates/admin.html:210
 msgid "Are you sure you want to restart?"
 msgstr "您确定要重启吗？"
 
-#: cps/templates/admin.html:213 cps/templates/admin.html:227
-#: cps/templates/admin.html:247 cps/templates/config_db.html:70
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:249 cps/templates/config_db.html:70
 msgid "OK"
 msgstr "确定"
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/admin.html:216 cps/templates/admin.html:230
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr "取消"
 
-#: cps/templates/admin.html:226
+#: cps/templates/admin.html:228
 msgid "Are you sure you want to shutdown?"
 msgstr "您确定要关闭吗？"
 
-#: cps/templates/admin.html:238
+#: cps/templates/admin.html:240
 msgid "Updating, please do not reload this page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -1587,44 +1609,43 @@ msgstr "通过"
 msgid "In Library"
 msgstr "在书库"
 
-#: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr "按图书日期排序，最新优先"
 
-#: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr "按图书日期排序，最旧优先"
 
-#: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr "按标题按字母顺序排序"
 
-#: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr "按标题逆字母顺序排序"
 
-#: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr "按出版日期排序，最新优先"
 
-#: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr "按出版日期排序，最旧优先"
 
-#: cps/templates/author.html:57 cps/templates/author.html:117
-#: cps/templates/discover.html:30 cps/templates/index.html:29
-#: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:54
+#: cps/templates/author.html:56 cps/templates/author.html:115
+#: cps/templates/index.html:29 cps/templates/index.html:112
+#: cps/templates/search.html:66 cps/templates/shelf.html:54
 msgid "reduce"
 msgstr "减少"
 
-#: cps/templates/author.html:101
+#: cps/templates/author.html:99
 msgid "More by"
 msgstr "更多"
 
@@ -1749,7 +1770,7 @@ msgid "Fetch Metadata"
 msgstr "获取元数据"
 
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
@@ -1876,26 +1897,34 @@ msgstr "输入简介"
 msgid "Comments"
 msgstr "简介"
 
-#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
-#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
-#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
-#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+#: cps/templates/book_table.html:75
+msgid "Archiv Status"
+msgstr "存档状态"
+
+#: cps/templates/book_table.html:77 cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr "阅读状态"
+
+#: cps/templates/book_table.html:80 cps/templates/book_table.html:82
+#: cps/templates/book_table.html:84 cps/templates/book_table.html:86
+#: cps/templates/book_table.html:90 cps/templates/book_table.html:92
+#: cps/templates/book_table.html:96
 msgid "Enter "
 msgstr "输入"
 
-#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+#: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
 msgid "Are you really sure?"
 msgstr "您真的确认？"
 
-#: cps/templates/book_table.html:114
+#: cps/templates/book_table.html:117
 msgid "Books with Title will be merged from:"
 msgstr "这本书籍将被合并："
 
-#: cps/templates/book_table.html:118
+#: cps/templates/book_table.html:121
 msgid "Into Book with Title:"
 msgstr "合并到这本书籍："
 
-#: cps/templates/book_table.html:123
+#: cps/templates/book_table.html:126
 msgid "Merge"
 msgstr "合并"
 
@@ -2071,11 +2100,6 @@ msgstr "LDAP服务器端口"
 msgid "LDAP Encryption"
 msgstr "LDAP 加密"
 
-#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
-#: cps/templates/email_edit.html:41
-msgid "None"
-msgstr "无"
-
 #: cps/templates/config_edit.html:205
 msgid "TLS"
 msgstr "TLS协议"
@@ -2292,11 +2316,11 @@ msgstr "新用户默认显示权限"
 msgid "Show Random Books in Detail View"
 msgstr "在主页显示随机书籍"
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+#: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr "添加显示或隐藏书籍的标签值"
 
-#: cps/templates/config_view_edit.html:166
+#: cps/templates/config_view_edit.html:167
 msgid "Add Allowed/Denied custom column values"
 msgstr "添加显示或隐藏书籍的自定义栏目值"
 
@@ -2345,13 +2369,13 @@ msgstr "归档"
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:256 cps/templates/search.html:14
+#: cps/templates/detail.html:256 cps/templates/search.html:15
 msgid "Add to shelf"
 msgstr "添加到书架"
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:20
+#: cps/templates/search.html:21
 msgid "(Public)"
 msgstr "(公共)"
 
@@ -2429,10 +2453,14 @@ msgstr "禁止注册的域名（黑名单）"
 msgid "Next"
 msgstr "下一个"
 
-#: cps/templates/generate_kobo_auth_url.html:5
+#: cps/templates/generate_kobo_auth_url.html:6
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr "在文本编辑器中打开.kobo/Kobo eReader.conf，添加（或编辑）:"
 
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Kobo Token:"
+msgstr "Kobo Token:"
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr "Calibre-Web 实例未配置，请联系您的管理员！"
@@ -2449,29 +2477,29 @@ msgstr "回到首页"
 msgid "Logout User"
 msgstr "登出账号"
 
-#: cps/templates/index.html:69
+#: cps/templates/index.html:70
 msgid "Sort ascending according to download count"
 msgstr "按下载数排序"
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort descending according to download count"
 msgstr "按下载数逆序排序"
 
-#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr "按作者字母顺序排序"
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr "按作者逆字母顺序排序"
 
-#: cps/templates/index.html:81
+#: cps/templates/index.html:82
 msgid "Sort ascending according to series index"
 msgstr "按丛书编号排序"
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort descending according to series index"
 msgstr "按丛书编号逆排序"
 
@@ -2901,10 +2929,6 @@ msgstr "出版日期从"
 msgid "Published Date To"
 msgstr "出版日期到"
 
-#: cps/templates/search_form.html:42
-msgid "Read Status"
-msgstr "阅读状态"
-
 #: cps/templates/search_form.html:59
 msgid "Exclude Tags"
 msgstr "排除标签"
@@ -3067,7 +3091,7 @@ msgstr "新建或查看"
 
 #: cps/templates/user_edit.html:70
 msgid "Force full kobo sync"
-msgstr ""
+msgstr "强制与kobo完全同步"
 
 #: cps/templates/user_edit.html:88
 msgid "Add allowed/Denied Custom Column Values"
diff --git a/messages.pot b/messages.pot
index 7fc39068..b3c09809 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,585 +8,588 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2022-01-15 09:19+0100\n"
+"POT-Creation-Date: 2022-04-18 12:20+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.9.0\n"
+"Generated-By: Babel 2.9.1\n"
 
-#: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31
-msgid "not installed"
-msgstr ""
-
-#: cps/about.py:47 cps/about.py:63
-msgid "installed"
-msgstr ""
-
-#: cps/about.py:145
+#: cps/about.py:86
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:144
+#: cps/admin.py:141
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:146
+#: cps/admin.py:143
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:151
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:154
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:707 cps/editbooks.py:721
-#: cps/editbooks.py:866 cps/editbooks.py:868 cps/editbooks.py:895
-#: cps/editbooks.py:911 cps/updater.py:584 cps/uploader.py:93
-#: cps/uploader.py:103
+#: cps/admin.py:176 cps/editbooks.py:713 cps/editbooks.py:892
+#: cps/editbooks.py:894 cps/editbooks.py:930 cps/editbooks.py:947
+#: cps/updater.py:608 cps/uploader.py:93 cps/uploader.py:103
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:188
+#: cps/admin.py:197
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:207
+#: cps/admin.py:217
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:244
+#: cps/admin.py:255
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:277 cps/templates/admin.html:50
+#: cps/admin.py:289 cps/templates/admin.html:51
 msgid "Edit Users"
 msgstr ""
 
-#: cps/admin.py:318 cps/opds.py:109 cps/opds.py:198 cps/opds.py:275
-#: cps/opds.py:327 cps/templates/grid.html:13 cps/templates/languages.html:9
+#: cps/admin.py:333 cps/opds.py:529 cps/templates/grid.html:13
 #: cps/templates/list.html:13
 msgid "All"
 msgstr ""
 
-#: cps/admin.py:343 cps/admin.py:1615
+#: cps/admin.py:360 cps/admin.py:1648
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:357
+#: cps/admin.py:374
 msgid "{} users deleted successfully"
 msgstr ""
 
-#: cps/admin.py:379 cps/templates/config_view_edit.html:133
+#: cps/admin.py:397 cps/templates/config_view_edit.html:133
 #: cps/templates/user_edit.html:45 cps/templates/user_table.html:81
 msgid "Show All"
 msgstr ""
 
-#: cps/admin.py:400 cps/admin.py:406
+#: cps/admin.py:418 cps/admin.py:424
 msgid "Malformed request"
 msgstr ""
 
-#: cps/admin.py:418 cps/admin.py:1493
+#: cps/admin.py:436 cps/admin.py:1526
 msgid "Guest Name can't be changed"
 msgstr ""
 
-#: cps/admin.py:430
+#: cps/admin.py:448
 msgid "Guest can't have this role"
 msgstr ""
 
-#: cps/admin.py:442 cps/admin.py:1451
+#: cps/admin.py:460 cps/admin.py:1484
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:446 cps/admin.py:460
+#: cps/admin.py:464 cps/admin.py:478
 msgid "Value has to be true or false"
 msgstr ""
 
-#: cps/admin.py:448
+#: cps/admin.py:466
 msgid "Invalid role"
 msgstr ""
 
-#: cps/admin.py:452
+#: cps/admin.py:470
 msgid "Guest can't have this view"
 msgstr ""
 
-#: cps/admin.py:462
+#: cps/admin.py:480
 msgid "Invalid view"
 msgstr ""
 
-#: cps/admin.py:465
+#: cps/admin.py:483
 msgid "Guest's Locale is determined automatically and can't be set"
 msgstr ""
 
-#: cps/admin.py:469
+#: cps/admin.py:487
 msgid "No Valid Locale Given"
 msgstr ""
 
-#: cps/admin.py:480
+#: cps/admin.py:498
 msgid "No Valid Book Language Given"
 msgstr ""
 
-#: cps/admin.py:482
+#: cps/admin.py:500 cps/editbooks.py:1267
 msgid "Parameter not found"
 msgstr ""
 
-#: cps/admin.py:533
+#: cps/admin.py:553
 msgid "Invalid Read Column"
 msgstr ""
 
-#: cps/admin.py:539
+#: cps/admin.py:559
 msgid "Invalid Restricted Column"
 msgstr ""
 
-#: cps/admin.py:560 cps/admin.py:1323
+#: cps/admin.py:579 cps/admin.py:1355
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:572
+#: cps/admin.py:591
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:574
+#: cps/admin.py:593
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:576
+#: cps/admin.py:595
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:578
+#: cps/admin.py:597
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:580
+#: cps/admin.py:599
 msgid "Are you sure you want to change locales of selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:582
+#: cps/admin.py:601
 msgid "Are you sure you want to change visible book languages for selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:584
+#: cps/admin.py:603
 msgid "Are you sure you want to change the selected role for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:586
+#: cps/admin.py:605
 msgid "Are you sure you want to change the selected restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:588
+#: cps/admin.py:607
 msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:590
+#: cps/admin.py:610
 msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?"
 msgstr ""
 
-#: cps/admin.py:592
+#: cps/admin.py:612
 msgid "Are you sure you want to change Calibre library location?"
 msgstr ""
 
-#: cps/admin.py:594
+#: cps/admin.py:614
 msgid "Are you sure you want delete Calibre-Web's sync database to force a full sync with your Kobo Reader?"
 msgstr ""
 
-#: cps/admin.py:743
+#: cps/admin.py:764
 msgid "Tag not found"
 msgstr ""
 
-#: cps/admin.py:755
+#: cps/admin.py:776
 msgid "Invalid Action"
 msgstr ""
 
-#: cps/admin.py:871 cps/admin.py:877 cps/admin.py:887 cps/admin.py:897
+#: cps/admin.py:893 cps/admin.py:899 cps/admin.py:909 cps/admin.py:919
 #: cps/templates/modal_dialogs.html:29 cps/templates/user_table.html:41
 #: cps/templates/user_table.html:58
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:873 cps/admin.py:879 cps/admin.py:889 cps/admin.py:899
+#: cps/admin.py:895 cps/admin.py:901 cps/admin.py:911 cps/admin.py:921
 #: cps/templates/modal_dialogs.html:28 cps/templates/user_table.html:44
 #: cps/templates/user_table.html:61
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:913
+#: cps/admin.py:936
 msgid "{} sync entries deleted"
 msgstr ""
 
-#: cps/admin.py:1036
+#: cps/admin.py:1059
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:1081
+#: cps/admin.py:1104
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1087
+#: cps/admin.py:1110
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1117
+#: cps/admin.py:1140
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:1123
+#: cps/admin.py:1146
 msgid "Please Enter a LDAP Service Account and Password"
 msgstr ""
 
-#: cps/admin.py:1126
+#: cps/admin.py:1149
 msgid "Please Enter a LDAP Service Account"
 msgstr ""
 
-#: cps/admin.py:1131
+#: cps/admin.py:1154
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1133
+#: cps/admin.py:1156
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1137
+#: cps/admin.py:1160
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1139
+#: cps/admin.py:1162
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1146
+#: cps/admin.py:1169
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:1148
+#: cps/admin.py:1171
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:1155
+#: cps/admin.py:1178
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:1197 cps/admin.py:1308 cps/admin.py:1405 cps/admin.py:1521
-#: cps/admin.py:1590 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
-#: cps/shelf.py:279 cps/shelf.py:341 cps/shelf.py:376 cps/shelf.py:451
-msgid "Settings DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1208
-msgid "DB Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1223
-msgid "DB is not Writeable"
-msgstr ""
-
-#: cps/admin.py:1235
-msgid "Keyfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1239
-msgid "Certfile Location is not Valid, Please Enter Correct Path"
-msgstr ""
-
-#: cps/admin.py:1346
-msgid "Database Settings updated"
-msgstr ""
-
-#: cps/admin.py:1354
-msgid "Database Configuration"
-msgstr ""
-
-#: cps/admin.py:1370 cps/web.py:1479
-msgid "Please fill out all fields!"
-msgstr ""
-
-#: cps/admin.py:1378
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/admin.py:1384 cps/admin.py:1543
-msgid "Add new user"
-msgstr ""
-
-#: cps/admin.py:1395
-#, python-format
-msgid "User '%(user)s' created"
-msgstr ""
-
-#: cps/admin.py:1401
-msgid "Found an existing account for this e-mail address or name."
-msgstr ""
-
-#: cps/admin.py:1430
-#, python-format
-msgid "User '%(nick)s' deleted"
-msgstr ""
-
-#: cps/admin.py:1432 cps/admin.py:1433
-msgid "Can't delete Guest User"
-msgstr ""
-
-#: cps/admin.py:1436
-msgid "No admin user remaining, can't delete user"
-msgstr ""
-
-#: cps/admin.py:1509 cps/admin.py:1634
-#, python-format
-msgid "Edit User %(nick)s"
-msgstr ""
-
-#: cps/admin.py:1513
-#, python-format
-msgid "User '%(nick)s' updated"
-msgstr ""
-
-#: cps/admin.py:1517 cps/admin.py:1649 cps/web.py:1504 cps/web.py:1564
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/admin.py:1552 cps/templates/admin.html:98
-msgid "Edit E-mail Server Settings"
-msgstr ""
-
-#: cps/admin.py:1571
-msgid "Gmail Account Verification Successful"
-msgstr ""
-
-#: cps/admin.py:1597
-#, python-format
-msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
-msgstr ""
-
-#: cps/admin.py:1600
-#, python-format
-msgid "There was an error sending the Test e-mail: %(res)s"
-msgstr ""
-
-#: cps/admin.py:1602
-msgid "Please configure your e-mail address first..."
-msgstr ""
-
-#: cps/admin.py:1604
-msgid "E-mail server settings updated"
-msgstr ""
-
-#: cps/admin.py:1646
-#, python-format
-msgid "Password for user %(user)s reset"
-msgstr ""
-
-#: cps/admin.py:1652 cps/web.py:1444
-msgid "Please configure the SMTP mail settings first..."
-msgstr ""
-
-#: cps/admin.py:1663
-msgid "Logfile viewer"
-msgstr ""
-
-#: cps/admin.py:1729
-msgid "Requesting update package"
-msgstr ""
-
-#: cps/admin.py:1730
-msgid "Downloading update package"
-msgstr ""
-
-#: cps/admin.py:1731
-msgid "Unzipping update package"
-msgstr ""
-
-#: cps/admin.py:1732
-msgid "Replacing files"
-msgstr ""
-
-#: cps/admin.py:1733
-msgid "Database connections are closed"
-msgstr ""
-
-#: cps/admin.py:1734
-msgid "Stopping server"
-msgstr ""
-
-#: cps/admin.py:1735
-msgid "Update finished, please press okay and reload page"
-msgstr ""
-
-#: cps/admin.py:1736 cps/admin.py:1737 cps/admin.py:1738 cps/admin.py:1739
-#: cps/admin.py:1740 cps/admin.py:1741
-msgid "Update failed:"
-msgstr ""
-
-#: cps/admin.py:1736 cps/updater.py:385 cps/updater.py:595 cps/updater.py:597
-msgid "HTTP Error"
-msgstr ""
-
-#: cps/admin.py:1737 cps/updater.py:387 cps/updater.py:599
-msgid "Connection error"
-msgstr ""
-
-#: cps/admin.py:1738 cps/updater.py:389 cps/updater.py:601
-msgid "Timeout while establishing connection"
-msgstr ""
-
-#: cps/admin.py:1739 cps/updater.py:391 cps/updater.py:603
-msgid "General error"
-msgstr ""
-
-#: cps/admin.py:1740
-msgid "Update file could not be saved in temp dir"
-msgstr ""
-
-#: cps/admin.py:1741
-msgid "Files could not be replaced during update"
-msgstr ""
-
-#: cps/admin.py:1765
-msgid "Failed to extract at least One LDAP User"
-msgstr ""
-
-#: cps/admin.py:1810
-msgid "Failed to Create at Least One LDAP User"
-msgstr ""
-
-#: cps/admin.py:1823
-#, python-format
-msgid "Error: %(ldaperror)s"
-msgstr ""
-
-#: cps/admin.py:1827
-msgid "Error: No user returned in response of LDAP server"
-msgstr ""
-
-#: cps/admin.py:1860
-msgid "At Least One LDAP User Not Found in Database"
-msgstr ""
-
-#: cps/admin.py:1862
-msgid "{} User Successfully Imported"
-msgstr ""
-
-#: cps/converter.py:30
-msgid "not configured"
-msgstr ""
-
-#: cps/converter.py:32
-msgid "Execution permissions missing"
-msgstr ""
-
-#: cps/db.py:651 cps/web.py:667 cps/web.py:1155
-#, python-format
-msgid "Custom Column No.%(column)d is not existing in calibre database"
-msgstr ""
-
-#: cps/editbooks.py:300 cps/editbooks.py:302
-msgid "Book Format Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:309 cps/editbooks.py:311
-msgid "Book Successfully Deleted"
-msgstr ""
-
-#: cps/editbooks.py:361
-msgid "You are missing permissions to delete books"
-msgstr ""
-
-#: cps/editbooks.py:376 cps/editbooks.py:763 cps/web.py:523 cps/web.py:1703
-#: cps/web.py:1744 cps/web.py:1811
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
-msgstr ""
-
-#: cps/editbooks.py:410
-msgid "edit metadata"
-msgstr ""
-
-#: cps/editbooks.py:458
-#, python-format
-msgid "%(seriesindex)s is not a valid number, skipping"
-msgstr ""
-
-#: cps/editbooks.py:494 cps/editbooks.py:958
-#, python-format
-msgid "'%(langname)s' is not a valid language"
-msgstr ""
-
-#: cps/editbooks.py:634 cps/editbooks.py:985
-#, python-format
-msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr ""
-
-#: cps/editbooks.py:638 cps/editbooks.py:989
-msgid "File to be uploaded must have an extension"
-msgstr ""
-
-#: cps/editbooks.py:650
-#, python-format
-msgid "Failed to create path %(path)s (Permission denied)."
-msgstr ""
-
-#: cps/editbooks.py:655
-#, python-format
-msgid "Failed to store file %(file)s."
-msgstr ""
-
-#: cps/editbooks.py:673 cps/editbooks.py:1076 cps/web.py:1664
+#: cps/admin.py:1223 cps/admin.py:1339 cps/admin.py:1437 cps/admin.py:1554
+#: cps/admin.py:1623 cps/editbooks.py:678 cps/editbooks.py:882
+#: cps/editbooks.py:1130 cps/shelf.py:100 cps/shelf.py:160 cps/shelf.py:203
+#: cps/shelf.py:278 cps/shelf.py:343 cps/shelf.py:380 cps/shelf.py:456
+#: cps/web.py:1742
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:678
+#: cps/admin.py:1235
+msgid "DB Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1253
+msgid "DB is not Writeable"
+msgstr ""
+
+#: cps/admin.py:1266
+msgid "Keyfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1270
+msgid "Certfile Location is not Valid, Please Enter Correct Path"
+msgstr ""
+
+#: cps/admin.py:1378
+msgid "Database Settings updated"
+msgstr ""
+
+#: cps/admin.py:1386
+msgid "Database Configuration"
+msgstr ""
+
+#: cps/admin.py:1402 cps/web.py:1557
+msgid "Please fill out all fields!"
+msgstr ""
+
+#: cps/admin.py:1410
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:1416 cps/admin.py:1576
+msgid "Add new user"
+msgstr ""
+
+#: cps/admin.py:1427
+#, python-format
+msgid "User '%(user)s' created"
+msgstr ""
+
+#: cps/admin.py:1433
+msgid "Found an existing account for this e-mail address or name."
+msgstr ""
+
+#: cps/admin.py:1463
+#, python-format
+msgid "User '%(nick)s' deleted"
+msgstr ""
+
+#: cps/admin.py:1465 cps/admin.py:1466
+msgid "Can't delete Guest User"
+msgstr ""
+
+#: cps/admin.py:1469
+msgid "No admin user remaining, can't delete user"
+msgstr ""
+
+#: cps/admin.py:1542 cps/admin.py:1667
+#, python-format
+msgid "Edit User %(nick)s"
+msgstr ""
+
+#: cps/admin.py:1546
+#, python-format
+msgid "User '%(nick)s' updated"
+msgstr ""
+
+#: cps/admin.py:1550 cps/admin.py:1682 cps/web.py:1582 cps/web.py:1642
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:1585 cps/templates/admin.html:100
+msgid "Edit E-mail Server Settings"
+msgstr ""
+
+#: cps/admin.py:1604
+msgid "Gmail Account Verification Successful"
+msgstr ""
+
+#: cps/admin.py:1630
+#, python-format
+msgid "Test e-mail queued for sending to %(email)s, please check Tasks for result"
+msgstr ""
+
+#: cps/admin.py:1633
+#, python-format
+msgid "There was an error sending the Test e-mail: %(res)s"
+msgstr ""
+
+#: cps/admin.py:1635
+msgid "Please configure your e-mail address first..."
+msgstr ""
+
+#: cps/admin.py:1637
+msgid "E-mail server settings updated"
+msgstr ""
+
+#: cps/admin.py:1679
+#, python-format
+msgid "Password for user %(user)s reset"
+msgstr ""
+
+#: cps/admin.py:1685 cps/web.py:1522
+msgid "Please configure the SMTP mail settings first..."
+msgstr ""
+
+#: cps/admin.py:1696
+msgid "Logfile viewer"
+msgstr ""
+
+#: cps/admin.py:1762
+msgid "Requesting update package"
+msgstr ""
+
+#: cps/admin.py:1763
+msgid "Downloading update package"
+msgstr ""
+
+#: cps/admin.py:1764
+msgid "Unzipping update package"
+msgstr ""
+
+#: cps/admin.py:1765
+msgid "Replacing files"
+msgstr ""
+
+#: cps/admin.py:1766
+msgid "Database connections are closed"
+msgstr ""
+
+#: cps/admin.py:1767
+msgid "Stopping server"
+msgstr ""
+
+#: cps/admin.py:1768
+msgid "Update finished, please press okay and reload page"
+msgstr ""
+
+#: cps/admin.py:1769 cps/admin.py:1770 cps/admin.py:1771 cps/admin.py:1772
+#: cps/admin.py:1773 cps/admin.py:1774
+msgid "Update failed:"
+msgstr ""
+
+#: cps/admin.py:1769 cps/updater.py:384 cps/updater.py:619 cps/updater.py:621
+msgid "HTTP Error"
+msgstr ""
+
+#: cps/admin.py:1770 cps/updater.py:386 cps/updater.py:623
+msgid "Connection error"
+msgstr ""
+
+#: cps/admin.py:1771 cps/updater.py:388 cps/updater.py:625
+msgid "Timeout while establishing connection"
+msgstr ""
+
+#: cps/admin.py:1772 cps/updater.py:390 cps/updater.py:627
+msgid "General error"
+msgstr ""
+
+#: cps/admin.py:1773
+msgid "Update file could not be saved in temp dir"
+msgstr ""
+
+#: cps/admin.py:1774
+msgid "Files could not be replaced during update"
+msgstr ""
+
+#: cps/admin.py:1798
+msgid "Failed to extract at least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1843
+msgid "Failed to Create at Least One LDAP User"
+msgstr ""
+
+#: cps/admin.py:1856
+#, python-format
+msgid "Error: %(ldaperror)s"
+msgstr ""
+
+#: cps/admin.py:1860
+msgid "Error: No user returned in response of LDAP server"
+msgstr ""
+
+#: cps/admin.py:1893
+msgid "At Least One LDAP User Not Found in Database"
+msgstr ""
+
+#: cps/admin.py:1895
+msgid "{} User Successfully Imported"
+msgstr ""
+
+#: cps/converter.py:30
+msgid "not installed"
+msgstr ""
+
+#: cps/converter.py:31
+msgid "Execution permissions missing"
+msgstr ""
+
+#: cps/db.py:674 cps/web.py:710 cps/web.py:1222
+#, python-format
+msgid "Custom Column No.%(column)d is not existing in calibre database"
+msgstr ""
+
+#: cps/db.py:917 cps/templates/config_edit.html:204
+#: cps/templates/config_view_edit.html:62 cps/templates/email_edit.html:41
+#: cps/web.py:551 cps/web.py:585 cps/web.py:646 cps/web.py:671 cps/web.py:1003
+#: cps/web.py:1032 cps/web.py:1066 cps/web.py:1093 cps/web.py:1132
+msgid "None"
+msgstr ""
+
+#: cps/editbooks.py:295 cps/editbooks.py:297
+msgid "Book Format Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:304 cps/editbooks.py:306
+msgid "Book Successfully Deleted"
+msgstr ""
+
+#: cps/editbooks.py:358
+msgid "You are missing permissions to delete books"
+msgstr ""
+
+#: cps/editbooks.py:373 cps/editbooks.py:765 cps/web.py:518 cps/web.py:1783
+#: cps/web.py:1825 cps/web.py:1870
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgstr ""
+
+#: cps/editbooks.py:408
+msgid "edit metadata"
+msgstr ""
+
+#: cps/editbooks.py:457
+#, python-format
+msgid "%(seriesindex)s is not a valid number, skipping"
+msgstr ""
+
+#: cps/editbooks.py:493 cps/editbooks.py:1001
+#, python-format
+msgid "'%(langname)s' is not a valid language"
+msgstr ""
+
+#: cps/editbooks.py:634
+msgid "User has no rights to upload additional file formats"
+msgstr ""
+
+#: cps/editbooks.py:639 cps/editbooks.py:1029
+#, python-format
+msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
+msgstr ""
+
+#: cps/editbooks.py:643 cps/editbooks.py:1033
+msgid "File to be uploaded must have an extension"
+msgstr ""
+
+#: cps/editbooks.py:655
+#, python-format
+msgid "Failed to create path %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:660
+#, python-format
+msgid "Failed to store file %(file)s."
+msgstr ""
+
+#: cps/editbooks.py:683
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:814
+#: cps/editbooks.py:697 cps/editbooks.py:809
+msgid "User has no rights to upload cover"
+msgstr ""
+
+#: cps/editbooks.py:828
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:848
+#: cps/editbooks.py:869
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:861
-msgid "Error editing book, please check logfile for details"
+#: cps/editbooks.py:887
+msgid "Error editing book: {}"
 msgstr ""
 
-#: cps/editbooks.py:899
+#: cps/editbooks.py:951
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:997
+#: cps/editbooks.py:1041
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:1016
+#: cps/editbooks.py:1061
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:1063
+#: cps/editbooks.py:1117
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:1088
+#: cps/editbooks.py:1143
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:1096
+#: cps/editbooks.py:1151
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:1100
+#: cps/editbooks.py:1155
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -599,174 +602,190 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:77
+#: cps/helper.py:81
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:83 cps/tasks/convert.py:73
+#: cps/helper.py:87 cps/tasks/convert.py:75
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:88
+#: cps/helper.py:92
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:93 cps/helper.py:217 cps/templates/detail.html:41
+#: cps/helper.py:97 cps/helper.py:221 cps/templates/detail.html:41
 #: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:94 cps/helper.py:111 cps/helper.py:219
+#: cps/helper.py:98 cps/helper.py:115 cps/helper.py:223
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:109
+#: cps/helper.py:113
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:110
+#: cps/helper.py:114
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:127
+#: cps/helper.py:131
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:132
+#: cps/helper.py:136
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:143 cps/helper.py:149
+#: cps/helper.py:147 cps/helper.py:153
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:168 cps/helper.py:172 cps/helper.py:176
+#: cps/helper.py:172 cps/helper.py:176 cps/helper.py:180
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:216 cps/tasks/convert.py:90
+#: cps/helper.py:220 cps/tasks/convert.py:92
 #, python-format
 msgid "%(book)s send to Kindle"
 msgstr ""
 
-#: cps/helper.py:221
+#: cps/helper.py:225
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:313
+#: cps/helper.py:353
+msgid "Read status could not set: {}"
+msgstr ""
+
+#: cps/helper.py:376
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
 msgstr ""
 
-#: cps/helper.py:319
+#: cps/helper.py:382
 #, python-format
 msgid "Deleting book %(id)s failed: %(message)s"
 msgstr ""
 
-#: cps/helper.py:330
+#: cps/helper.py:393
 #, python-format
 msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s"
 msgstr ""
 
-#: cps/helper.py:385
+#: cps/helper.py:458
 #, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:400
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:425 cps/helper.py:435 cps/helper.py:443
+#: cps/helper.py:529 cps/helper.py:538
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:464
+#: cps/helper.py:572
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:592
+msgid "Error in rename file in path: {}"
+msgstr ""
+
+#: cps/helper.py:610
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:504 cps/web.py:1659
+#: cps/helper.py:651 cps/web.py:1737
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
-#: cps/helper.py:512
+#: cps/helper.py:659
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/helper.py:522
+#: cps/helper.py:669
 msgid "Invalid e-mail address format"
 msgstr ""
 
-#: cps/helper.py:595
-msgid "Error Downloading Cover"
-msgstr ""
-
-#: cps/helper.py:598
-msgid "Cover Format Error"
-msgstr ""
-
-#: cps/helper.py:608
-msgid "Failed to create path for cover"
-msgstr ""
-
-#: cps/helper.py:624
-msgid "Cover-file is not a valid image file, or could not be stored"
-msgstr ""
-
-#: cps/helper.py:635
-msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr ""
-
-#: cps/helper.py:648
-msgid "Invalid cover file content"
-msgstr ""
-
-#: cps/helper.py:652
-msgid "Only jpg/jpeg files are supported as coverfile"
-msgstr ""
-
-#: cps/helper.py:704
-msgid "Unrar binary file not found"
-msgstr ""
-
-#: cps/helper.py:715
-msgid "Error excecuting UnRar"
-msgstr ""
-
-#: cps/helper.py:763
-msgid "Waiting"
-msgstr ""
-
-#: cps/helper.py:765
-msgid "Failed"
+#: cps/helper.py:754
+msgid "Python modul 'advocate' is not installed but is needed for cover downloads"
 msgstr ""
 
 #: cps/helper.py:767
+msgid "Error Downloading Cover"
+msgstr ""
+
+#: cps/helper.py:770
+msgid "Cover Format Error"
+msgstr ""
+
+#: cps/helper.py:773
+msgid "You are not allowed to access localhost or the local network for cover uploads"
+msgstr ""
+
+#: cps/helper.py:783
+msgid "Failed to create path for cover"
+msgstr ""
+
+#: cps/helper.py:799
+msgid "Cover-file is not a valid image file, or could not be stored"
+msgstr ""
+
+#: cps/helper.py:810
+msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
+msgstr ""
+
+#: cps/helper.py:822
+msgid "Invalid cover file content"
+msgstr ""
+
+#: cps/helper.py:826
+msgid "Only jpg/jpeg files are supported as coverfile"
+msgstr ""
+
+#: cps/helper.py:878
+msgid "Unrar binary file not found"
+msgstr ""
+
+#: cps/helper.py:889
+msgid "Error excecuting UnRar"
+msgstr ""
+
+#: cps/helper.py:937
+msgid "Waiting"
+msgstr ""
+
+#: cps/helper.py:939
+msgid "Failed"
+msgstr ""
+
+#: cps/helper.py:941
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:769
+#: cps/helper.py:943
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:771
+#: cps/helper.py:945
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:127
-msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
+#: cps/kobo_auth.py:128
+msgid "Please access Calibre-Web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:130 cps/kobo_auth.py:158
+#: cps/kobo_auth.py:154
 msgid "Kobo Setup"
 msgstr ""
 
@@ -775,7 +794,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1535
+#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1613
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -836,163 +855,163 @@ msgstr ""
 msgid "Google Oauth error: {}"
 msgstr ""
 
-#: cps/opds.py:384
+#: cps/opds.py:298
 msgid "{} Stars"
 msgstr ""
 
-#: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1584
+#: cps/remotelogin.py:62 cps/templates/layout.html:84
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1662
 msgid "Login"
 msgstr ""
 
-#: cps/remotelogin.py:77 cps/remotelogin.py:111
+#: cps/remotelogin.py:74 cps/remotelogin.py:108
 msgid "Token not found"
 msgstr ""
 
-#: cps/remotelogin.py:86 cps/remotelogin.py:119
+#: cps/remotelogin.py:83 cps/remotelogin.py:116
 msgid "Token has expired"
 msgstr ""
 
-#: cps/remotelogin.py:95
+#: cps/remotelogin.py:92
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:39 cps/web.py:416
+#: cps/render_template.py:41 cps/web.py:407
 msgid "Books"
 msgstr ""
 
-#: cps/render_template.py:41
+#: cps/render_template.py:43
 msgid "Show recent books"
 msgstr ""
 
-#: cps/render_template.py:42 cps/templates/index.xml:25
+#: cps/render_template.py:44 cps/templates/index.xml:25
 msgid "Hot Books"
 msgstr ""
 
-#: cps/render_template.py:44
+#: cps/render_template.py:46
 msgid "Show Hot Books"
 msgstr ""
 
-#: cps/render_template.py:46 cps/render_template.py:51
+#: cps/render_template.py:48 cps/render_template.py:53
 msgid "Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:48 cps/render_template.py:53
+#: cps/render_template.py:50 cps/render_template.py:55
 #: cps/templates/user_table.html:167
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:430
+#: cps/render_template.py:58 cps/templates/index.xml:32 cps/web.py:422
 msgid "Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:58 cps/templates/user_table.html:161
+#: cps/render_template.py:60 cps/templates/user_table.html:161
 msgid "Show Top Rated Books"
 msgstr ""
 
-#: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:676
+#: cps/render_template.py:61 cps/templates/index.xml:54
+#: cps/templates/index.xml:58 cps/web.py:729
 msgid "Read Books"
 msgstr ""
 
-#: cps/render_template.py:61
+#: cps/render_template.py:63
 msgid "Show read and unread"
 msgstr ""
 
-#: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:679
+#: cps/render_template.py:65 cps/templates/index.xml:61
+#: cps/templates/index.xml:65 cps/web.py:732
 msgid "Unread Books"
 msgstr ""
 
-#: cps/render_template.py:65
+#: cps/render_template.py:67
 msgid "Show unread"
 msgstr ""
 
-#: cps/render_template.py:66
+#: cps/render_template.py:68
 msgid "Discover"
 msgstr ""
 
-#: cps/render_template.py:68 cps/templates/index.xml:50
+#: cps/render_template.py:70 cps/templates/index.xml:50
 #: cps/templates/user_table.html:162
 msgid "Show Random Books"
 msgstr ""
 
-#: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1041
+#: cps/render_template.py:71 cps/templates/book_table.html:67
+#: cps/templates/index.xml:83 cps/web.py:1135
 msgid "Categories"
 msgstr ""
 
-#: cps/render_template.py:71 cps/templates/user_table.html:158
+#: cps/render_template.py:73 cps/templates/user_table.html:158
 msgid "Show category selection"
 msgstr ""
 
-#: cps/render_template.py:72 cps/templates/book_edit.html:90
+#: cps/render_template.py:74 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:948 cps/web.py:959
+#: cps/templates/search_form.html:69 cps/web.py:1034 cps/web.py:1041
 msgid "Series"
 msgstr ""
 
-#: cps/render_template.py:74 cps/templates/user_table.html:157
+#: cps/render_template.py:76 cps/templates/user_table.html:157
 msgid "Show series selection"
 msgstr ""
 
-#: cps/render_template.py:75 cps/templates/book_table.html:66
+#: cps/render_template.py:77 cps/templates/book_table.html:66
 #: cps/templates/index.xml:69
 msgid "Authors"
 msgstr ""
 
-#: cps/render_template.py:77 cps/templates/user_table.html:160
+#: cps/render_template.py:79 cps/templates/user_table.html:160
 msgid "Show author selection"
 msgstr ""
 
-#: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:925
+#: cps/render_template.py:81 cps/templates/book_table.html:72
+#: cps/templates/index.xml:76 cps/web.py:1006
 msgid "Publishers"
 msgstr ""
 
-#: cps/render_template.py:81 cps/templates/user_table.html:163
+#: cps/render_template.py:83 cps/templates/user_table.html:163
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/render_template.py:82 cps/templates/book_table.html:70
+#: cps/render_template.py:84 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1018
+#: cps/web.py:1108
 msgid "Languages"
 msgstr ""
 
-#: cps/render_template.py:85 cps/templates/user_table.html:155
+#: cps/render_template.py:87 cps/templates/user_table.html:155
 msgid "Show language selection"
 msgstr ""
 
-#: cps/render_template.py:86 cps/templates/index.xml:104
+#: cps/render_template.py:88 cps/templates/index.xml:104
 msgid "Ratings"
 msgstr ""
 
-#: cps/render_template.py:88 cps/templates/user_table.html:164
+#: cps/render_template.py:90 cps/templates/user_table.html:164
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/render_template.py:89 cps/templates/index.xml:112
+#: cps/render_template.py:91 cps/templates/index.xml:112
 msgid "File formats"
 msgstr ""
 
-#: cps/render_template.py:91 cps/templates/user_table.html:165
+#: cps/render_template.py:93 cps/templates/user_table.html:165
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:703
+#: cps/render_template.py:95 cps/web.py:755
 msgid "Archived Books"
 msgstr ""
 
-#: cps/render_template.py:95 cps/templates/user_table.html:166
+#: cps/render_template.py:97 cps/templates/user_table.html:166
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:780
+#: cps/render_template.py:100 cps/web.py:837
 msgid "Books List"
 msgstr ""
 
-#: cps/render_template.py:99 cps/templates/user_table.html:168
+#: cps/render_template.py:102 cps/templates/user_table.html:168
 msgid "Show Books List"
 msgstr ""
 
@@ -1046,260 +1065,264 @@ msgstr ""
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/shelf.py:237
+#: cps/shelf.py:236
 msgid "Sorry you are not allowed to edit this shelf"
 msgstr ""
 
-#: cps/shelf.py:239
+#: cps/shelf.py:238
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:249
+#: cps/shelf.py:248
 msgid "Sorry you are not allowed to create a public shelf"
 msgstr ""
 
-#: cps/shelf.py:266
+#: cps/shelf.py:265
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:269
+#: cps/shelf.py:268
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:283
+#: cps/shelf.py:282
 msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:305
+#: cps/shelf.py:304
 #, python-format
 msgid "A public shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/shelf.py:316
+#: cps/shelf.py:315
 #, python-format
 msgid "A private shelf with the name '%(title)s' already exists."
 msgstr ""
 
 #: cps/shelf.py:337
+msgid "Error deleting Shelf"
+msgstr ""
+
+#: cps/shelf.py:339
 msgid "Shelf successfully deleted"
 msgstr ""
 
-#: cps/shelf.py:386
+#: cps/shelf.py:389
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:456
+#: cps/shelf.py:461
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:460
+#: cps/shelf.py:465
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/updater.py:403 cps/updater.py:414 cps/updater.py:514 cps/updater.py:529
+#: cps/updater.py:426 cps/updater.py:437 cps/updater.py:538 cps/updater.py:553
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:410 cps/updater.py:521
+#: cps/updater.py:433 cps/updater.py:545
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:428
+#: cps/updater.py:451
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:446
+#: cps/updater.py:469
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:456
+#: cps/updater.py:479
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490
+#: cps/updater.py:488 cps/updater.py:502 cps/updater.py:513
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:507
+#: cps/updater.py:531
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:440
+#: cps/templates/index.html:5 cps/web.py:434
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:471
+#: cps/web.py:470
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:507
+#: cps/web.py:501
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:539
+#: cps/web.py:534
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:554
+#: cps/web.py:570
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:569
+#: cps/web.py:598
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:582
+#: cps/web.py:610
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:597
+#: cps/web.py:626
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:615
+#: cps/web.py:663
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:631
+#: cps/web.py:690
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:737 cps/web.py:1371
+#: cps/templates/layout.html:56 cps/web.py:789 cps/web.py:1444
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:750 cps/web.py:1077
+#: cps/web.py:807 cps/web.py:1164
 msgid "Search"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:903
+#: cps/templates/admin.html:16 cps/web.py:979
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:980
+#: cps/web.py:1068
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1001
+#: cps/web.py:1095
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1055
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1149
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1215
+#: cps/web.py:1286
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1222
+#: cps/web.py:1293
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1244
+#: cps/web.py:1315
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1246
+#: cps/web.py:1317
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1248
+#: cps/web.py:1319
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1353
+#: cps/web.py:1425
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1449
+#: cps/web.py:1527
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1453
+#: cps/web.py:1531
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1455
+#: cps/web.py:1533
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1472
+#: cps/web.py:1550
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1473
-#: cps/web.py:1480 cps/web.py:1486 cps/web.py:1505 cps/web.py:1509
-#: cps/web.py:1515
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1551
+#: cps/web.py:1558 cps/web.py:1564 cps/web.py:1583 cps/web.py:1587
+#: cps/web.py:1593
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1507
+#: cps/web.py:1585
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1510
+#: cps/web.py:1588
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1524
+#: cps/web.py:1602
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1543
+#: cps/web.py:1621
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1549
+#: cps/web.py:1627
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1553 cps/web.py:1578
+#: cps/web.py:1631 cps/web.py:1656
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1560
+#: cps/web.py:1638
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1566
+#: cps/web.py:1644
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1573
+#: cps/web.py:1651
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1639 cps/web.py:1688
+#: cps/web.py:1717 cps/web.py:1766
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1655
+#: cps/web.py:1733
 msgid "Profile updated"
 msgstr ""
 
@@ -1307,36 +1330,36 @@ msgstr ""
 msgid "Found no valid gmail.json file with OAuth information"
 msgstr ""
 
-#: cps/tasks/convert.py:137
+#: cps/tasks/convert.py:154
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:163
+#: cps/tasks/convert.py:187
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:167
+#: cps/tasks/convert.py:191
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:177
+#: cps/tasks/convert.py:201
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:199
+#: cps/tasks/convert.py:223
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:222
+#: cps/tasks/convert.py:246
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:245
+#: cps/tasks/convert.py:269
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
@@ -1391,7 +1414,7 @@ msgid "Edit"
 msgstr ""
 
 #: cps/templates/admin.html:25 cps/templates/book_edit.html:16
-#: cps/templates/book_table.html:97 cps/templates/modal_dialogs.html:63
+#: cps/templates/book_table.html:100 cps/templates/modal_dialogs.html:63
 #: cps/templates/modal_dialogs.html:116 cps/templates/user_edit.html:67
 #: cps/templates/user_table.html:149
 msgid "Delete"
@@ -1401,179 +1424,179 @@ msgstr ""
 msgid "Public Shelf"
 msgstr ""
 
-#: cps/templates/admin.html:51
+#: cps/templates/admin.html:53
 msgid "Add New User"
 msgstr ""
 
-#: cps/templates/admin.html:53
+#: cps/templates/admin.html:55
 msgid "Import LDAP Users"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:62
 msgid "E-mail Server Settings"
 msgstr ""
 
-#: cps/templates/admin.html:65 cps/templates/email_edit.html:31
+#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
 msgid "SMTP Hostname"
 msgstr ""
 
-#: cps/templates/admin.html:69 cps/templates/email_edit.html:35
+#: cps/templates/admin.html:71 cps/templates/email_edit.html:35
 msgid "SMTP Port"
 msgstr ""
 
-#: cps/templates/admin.html:73 cps/templates/email_edit.html:39
+#: cps/templates/admin.html:75 cps/templates/email_edit.html:39
 msgid "Encryption"
 msgstr ""
 
-#: cps/templates/admin.html:77 cps/templates/email_edit.html:47
+#: cps/templates/admin.html:79 cps/templates/email_edit.html:47
 msgid "SMTP Login"
 msgstr ""
 
-#: cps/templates/admin.html:81 cps/templates/admin.html:92
+#: cps/templates/admin.html:83 cps/templates/admin.html:94
 #: cps/templates/email_edit.html:55
 msgid "From E-mail"
 msgstr ""
 
-#: cps/templates/admin.html:88
+#: cps/templates/admin.html:90
 msgid "E-Mail Service"
 msgstr ""
 
-#: cps/templates/admin.html:89
+#: cps/templates/admin.html:91
 msgid "Gmail via Oauth2"
 msgstr ""
 
-#: cps/templates/admin.html:104
+#: cps/templates/admin.html:106
 msgid "Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Calibre Database Directory"
 msgstr ""
 
-#: cps/templates/admin.html:111 cps/templates/config_edit.html:68
+#: cps/templates/admin.html:113 cps/templates/config_edit.html:68
 msgid "Log Level"
 msgstr ""
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "External Port"
 msgstr ""
 
-#: cps/templates/admin.html:127 cps/templates/config_view_edit.html:28
+#: cps/templates/admin.html:129 cps/templates/config_view_edit.html:28
 msgid "Books per Page"
 msgstr ""
 
-#: cps/templates/admin.html:131
+#: cps/templates/admin.html:133
 msgid "Uploads"
 msgstr ""
 
-#: cps/templates/admin.html:135
+#: cps/templates/admin.html:137
 msgid "Anonymous Browsing"
 msgstr ""
 
-#: cps/templates/admin.html:139
+#: cps/templates/admin.html:141
 msgid "Public Registration"
 msgstr ""
 
-#: cps/templates/admin.html:143
+#: cps/templates/admin.html:145
 msgid "Magic Link Remote Login"
 msgstr ""
 
-#: cps/templates/admin.html:147
+#: cps/templates/admin.html:149
 msgid "Reverse Proxy Login"
 msgstr ""
 
-#: cps/templates/admin.html:152 cps/templates/config_edit.html:173
+#: cps/templates/admin.html:154 cps/templates/config_edit.html:173
 msgid "Reverse Proxy Header Name"
 msgstr ""
 
-#: cps/templates/admin.html:157
+#: cps/templates/admin.html:159
 msgid "Edit Calibre Database Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:158
+#: cps/templates/admin.html:160
 msgid "Edit Basic Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:159
+#: cps/templates/admin.html:161
 msgid "Edit UI Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:164
+#: cps/templates/admin.html:166
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:165
+#: cps/templates/admin.html:167
 msgid "Download Debug Package"
 msgstr ""
 
-#: cps/templates/admin.html:166
+#: cps/templates/admin.html:168
 msgid "View Logs"
 msgstr ""
 
-#: cps/templates/admin.html:169
+#: cps/templates/admin.html:171
 msgid "Reconnect Calibre Database"
 msgstr ""
 
-#: cps/templates/admin.html:170
+#: cps/templates/admin.html:172
 msgid "Restart"
 msgstr ""
 
-#: cps/templates/admin.html:171
+#: cps/templates/admin.html:173
 msgid "Shutdown"
 msgstr ""
 
-#: cps/templates/admin.html:176
+#: cps/templates/admin.html:178
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:180
+#: cps/templates/admin.html:182
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:181
+#: cps/templates/admin.html:183
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:187
+#: cps/templates/admin.html:189
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:194
+#: cps/templates/admin.html:196
 msgid "Check for Update"
 msgstr ""
 
-#: cps/templates/admin.html:195
+#: cps/templates/admin.html:197
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:208
+#: cps/templates/admin.html:210
 msgid "Are you sure you want to restart?"
 msgstr ""
 
-#: cps/templates/admin.html:213 cps/templates/admin.html:227
-#: cps/templates/admin.html:247 cps/templates/config_db.html:70
+#: cps/templates/admin.html:215 cps/templates/admin.html:229
+#: cps/templates/admin.html:249 cps/templates/config_db.html:70
 msgid "OK"
 msgstr ""
 
-#: cps/templates/admin.html:214 cps/templates/admin.html:228
-#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124
+#: cps/templates/admin.html:216 cps/templates/admin.html:230
+#: cps/templates/book_edit.html:213 cps/templates/book_table.html:127
 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359
-#: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64
+#: cps/templates/config_view_edit.html:175 cps/templates/modal_dialogs.html:64
 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117
 #: cps/templates/modal_dialogs.html:135 cps/templates/shelf_edit.html:27
 #: cps/templates/user_edit.html:144
 msgid "Cancel"
 msgstr ""
 
-#: cps/templates/admin.html:226
+#: cps/templates/admin.html:228
 msgid "Are you sure you want to shutdown?"
 msgstr ""
 
-#: cps/templates/admin.html:238
+#: cps/templates/admin.html:240
 msgid "Updating, please do not reload this page"
 msgstr ""
 
@@ -1585,44 +1608,43 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:26 cps/templates/index.html:72
-#: cps/templates/search.html:29 cps/templates/shelf.html:19
+#: cps/templates/author.html:26 cps/templates/index.html:73
+#: cps/templates/search.html:30 cps/templates/shelf.html:19
 msgid "Sort according to book date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:27 cps/templates/index.html:73
-#: cps/templates/search.html:30 cps/templates/shelf.html:20
+#: cps/templates/author.html:27 cps/templates/index.html:74
+#: cps/templates/search.html:31 cps/templates/shelf.html:20
 msgid "Sort according to book date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:28 cps/templates/index.html:74
-#: cps/templates/search.html:31 cps/templates/shelf.html:21
+#: cps/templates/author.html:28 cps/templates/index.html:75
+#: cps/templates/search.html:32 cps/templates/shelf.html:21
 msgid "Sort title in alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:29 cps/templates/index.html:75
-#: cps/templates/search.html:32 cps/templates/shelf.html:22
+#: cps/templates/author.html:29 cps/templates/index.html:76
+#: cps/templates/search.html:33 cps/templates/shelf.html:22
 msgid "Sort title in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/author.html:30 cps/templates/index.html:78
-#: cps/templates/search.html:35 cps/templates/shelf.html:25
+#: cps/templates/author.html:30 cps/templates/index.html:79
+#: cps/templates/search.html:36 cps/templates/shelf.html:25
 msgid "Sort according to publishing date, newest first"
 msgstr ""
 
-#: cps/templates/author.html:31 cps/templates/index.html:79
-#: cps/templates/search.html:36 cps/templates/shelf.html:26
+#: cps/templates/author.html:31 cps/templates/index.html:80
+#: cps/templates/search.html:37 cps/templates/shelf.html:26
 msgid "Sort according to publishing date, oldest first"
 msgstr ""
 
-#: cps/templates/author.html:57 cps/templates/author.html:117
-#: cps/templates/discover.html:30 cps/templates/index.html:29
-#: cps/templates/index.html:111 cps/templates/search.html:65
-#: cps/templates/shelf.html:54
+#: cps/templates/author.html:56 cps/templates/author.html:115
+#: cps/templates/index.html:29 cps/templates/index.html:112
+#: cps/templates/search.html:66 cps/templates/shelf.html:54
 msgid "reduce"
 msgstr ""
 
-#: cps/templates/author.html:101
+#: cps/templates/author.html:99
 msgid "More by"
 msgstr ""
 
@@ -1747,7 +1769,7 @@ msgid "Fetch Metadata"
 msgstr ""
 
 #: cps/templates/book_edit.html:212 cps/templates/config_db.html:53
-#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172
+#: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:174
 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25
 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:142
 msgid "Save"
@@ -1874,26 +1896,34 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
-#: cps/templates/book_table.html:77 cps/templates/book_table.html:79
-#: cps/templates/book_table.html:81 cps/templates/book_table.html:83
-#: cps/templates/book_table.html:87 cps/templates/book_table.html:89
-#: cps/templates/book_table.html:91 cps/templates/book_table.html:93
+#: cps/templates/book_table.html:75
+msgid "Archiv Status"
+msgstr ""
+
+#: cps/templates/book_table.html:77 cps/templates/search_form.html:42
+msgid "Read Status"
+msgstr ""
+
+#: cps/templates/book_table.html:80 cps/templates/book_table.html:82
+#: cps/templates/book_table.html:84 cps/templates/book_table.html:86
+#: cps/templates/book_table.html:90 cps/templates/book_table.html:92
+#: cps/templates/book_table.html:96
 msgid "Enter "
 msgstr ""
 
-#: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46
+#: cps/templates/book_table.html:113 cps/templates/modal_dialogs.html:46
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_table.html:114
+#: cps/templates/book_table.html:117
 msgid "Books with Title will be merged from:"
 msgstr ""
 
-#: cps/templates/book_table.html:118
+#: cps/templates/book_table.html:121
 msgid "Into Book with Title:"
 msgstr ""
 
-#: cps/templates/book_table.html:123
+#: cps/templates/book_table.html:126
 msgid "Merge"
 msgstr ""
 
@@ -2069,11 +2099,6 @@ msgstr ""
 msgid "LDAP Encryption"
 msgstr ""
 
-#: cps/templates/config_edit.html:204 cps/templates/config_view_edit.html:62
-#: cps/templates/email_edit.html:41
-msgid "None"
-msgstr ""
-
 #: cps/templates/config_edit.html:205
 msgid "TLS"
 msgstr ""
@@ -2290,11 +2315,11 @@ msgstr ""
 msgid "Show Random Books in Detail View"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:165 cps/templates/user_edit.html:87
+#: cps/templates/config_view_edit.html:166 cps/templates/user_edit.html:87
 msgid "Add Allowed/Denied Tags"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:166
+#: cps/templates/config_view_edit.html:167
 msgid "Add Allowed/Denied custom column values"
 msgstr ""
 
@@ -2343,13 +2368,13 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:256 cps/templates/search.html:14
+#: cps/templates/detail.html:256 cps/templates/search.html:15
 msgid "Add to shelf"
 msgstr ""
 
 #: cps/templates/detail.html:267 cps/templates/detail.html:284
 #: cps/templates/feed.xml:79 cps/templates/layout.html:137
-#: cps/templates/search.html:20
+#: cps/templates/search.html:21
 msgid "(Public)"
 msgstr ""
 
@@ -2427,10 +2452,14 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
-#: cps/templates/generate_kobo_auth_url.html:5
+#: cps/templates/generate_kobo_auth_url.html:6
 msgid "Open the .kobo/Kobo eReader.conf file in a text editor and add (or edit):"
 msgstr ""
 
+#: cps/templates/generate_kobo_auth_url.html:11
+msgid "Kobo Token:"
+msgstr ""
+
 #: cps/templates/http_error.html:31
 msgid "Calibre-Web Instance is unconfigured, please contact your administrator"
 msgstr ""
@@ -2447,29 +2476,29 @@ msgstr ""
 msgid "Logout User"
 msgstr ""
 
-#: cps/templates/index.html:69
+#: cps/templates/index.html:70
 msgid "Sort ascending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:70
+#: cps/templates/index.html:71
 msgid "Sort descending according to download count"
 msgstr ""
 
-#: cps/templates/index.html:76 cps/templates/search.html:33
+#: cps/templates/index.html:77 cps/templates/search.html:34
 #: cps/templates/shelf.html:23
 msgid "Sort authors in alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:77 cps/templates/search.html:34
+#: cps/templates/index.html:78 cps/templates/search.html:35
 #: cps/templates/shelf.html:24
 msgid "Sort authors in reverse alphabetical order"
 msgstr ""
 
-#: cps/templates/index.html:81
+#: cps/templates/index.html:82
 msgid "Sort ascending according to series index"
 msgstr ""
 
-#: cps/templates/index.html:82
+#: cps/templates/index.html:83
 msgid "Sort descending according to series index"
 msgstr ""
 
@@ -2899,10 +2928,6 @@ msgstr ""
 msgid "Published Date To"
 msgstr ""
 
-#: cps/templates/search_form.html:42
-msgid "Read Status"
-msgstr ""
-
 #: cps/templates/search_form.html:59
 msgid "Exclude Tags"
 msgstr ""

From a8680a45cadca5bdf5c20c17210ce15842a7437d Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 19 Apr 2022 15:05:41 +0200
Subject: [PATCH 195/220] Bugfixes from Testrun Update teststatus

---
 cps/db.py                               |    7 +-
 cps/metadata_provider/amazon.py         |   18 +-
 cps/templates/list.html                 |    2 +-
 cps/web.py                              |   40 +-
 test/Calibre-Web TestSummary_Linux.html | 2075 +++++++++++++++++------
 5 files changed, 1564 insertions(+), 578 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index ff392274..68e02b81 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -914,7 +914,8 @@ class CalibreDB:
                                  .filter(Languages.lang_code == None)
                                  .filter(self.common_filters())
                                  .count())
-                tags.append([Category(_("None"), "none"), no_lang_count])
+                if no_lang_count:
+                    tags.append([Category(_("None"), "none"), no_lang_count])
             return sorted(tags, key=lambda x: x[0].name, reverse=reverse_order)
         else:
             if not languages:
@@ -993,10 +994,12 @@ class Category:
     name = None
     id = None
     count = None
+    rating = None
 
-    def __init__(self, name, cat_id):
+    def __init__(self, name, cat_id, rating=None):
         self.name = name
         self.id = cat_id
+        self.rating = rating
         self.count = 1
 
 '''class Count:
diff --git a/cps/metadata_provider/amazon.py b/cps/metadata_provider/amazon.py
index 7de0d415..da3aed79 100644
--- a/cps/metadata_provider/amazon.py
+++ b/cps/metadata_provider/amazon.py
@@ -56,13 +56,13 @@ class Amazon(Metadata):
         self, query: str, generic_cover: str = "", locale: str = "en"
     ) -> Optional[List[MetaRecord]]:
         #timer=time()
-        def inner(link,index) -> tuple[dict,int]:
+        def inner(link, index) -> [dict, int]:
             with self.session as session:
                 try:
                     r = session.get(f"https://www.amazon.com/{link}")
                     r.raise_for_status()
-                except Exception as e:
-                    log.warning(e)
+                except Exception as ex:
+                    log.warning(ex)
                     return
                 long_soup = BS(r.text, "lxml")  #~4sec :/
                 soup2 = long_soup.find("div", attrs={"cel_widget_id": "dpx-books-ppd_csm_instrumentation_wrapper"})
@@ -126,16 +126,16 @@ class Amazon(Metadata):
                     headers=self.headers)
                 results.raise_for_status()
             except requests.exceptions.HTTPError as e:
-               log.error_or_exception(e)
-               return None
+                log.error_or_exception(e)
+                return None
             except Exception as e:
-               log.warning(e)
-               return None
+                log.warning(e)
+                return None
             soup = BS(results.text, 'html.parser')
             links_list = [next(filter(lambda i: "digital-text" in i["href"], x.findAll("a")))["href"] for x in
                           soup.findAll("div", attrs={"data-component-type": "s-search-result"})]
             with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
                 fut = {executor.submit(inner, link, index) for index, link in enumerate(links_list[:5])}
-                val=list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
-        result=list(filter(lambda x: x, val))
+                val = list(map(lambda x : x.result() ,concurrent.futures.as_completed(fut)))
+        result = list(filter(lambda x: x, val))
         return [x[0] for x in sorted(result, key=itemgetter(1))] #sort by amazons listing order for best relevance
diff --git a/cps/templates/list.html b/cps/templates/list.html
index ed59661e..a9089823 100644
--- a/cps/templates/list.html
+++ b/cps/templates/list.html
@@ -29,7 +29,7 @@
         </div>
         <div id="second" class="col-xs-12 col-sm-6">
       {% endif %}
-      <div class="row" {% if entry[0].sort %}data-name="{{entry[0].name}}"{% endif %} data-id="{% if entry[0].sort %}{{entry[0].sort}}{% else %}{% if entry.name %}{{entry.name}}{% else %}{{entry[0].name}}{% endif %}{% endif %}">
+      <div class="row" {% if entry[0].sort %}data-name="{{entry[0].name}}"{% endif %} data-id="{% if entry[0].sort %}{{entry[0].sort}}{% else %}{% if entry[0].format %}{{entry[0].format}}{% else %}{% if entry[0].rating %}{{entry[0].rating}}{% else %}{{entry[0].name}}{% endif %}{% endif %}{% endif %}">
         <div class="col-xs-2 col-sm-2 col-md-1" align="left"><span class="badge">{{entry[1]}}</span></div>
         <div class="col-xs-10 col-sm-10 col-md-11"><a id="list_{{loop.index0}}" href="{% if entry.format %}{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry.format )}}{% else %}{{url_for('web.books_list', data=data, sort_param='stored', book_id=entry[0].id )}}{% endif %}">
           {% if entry.name %}
diff --git a/cps/web.py b/cps/web.py
index ae4b12a8..517539f8 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -599,17 +599,29 @@ def render_series_books(page, book_id, order):
 
 
 def render_ratings_books(page, book_id, order):
-    name = calibre_db.session.query(db.Ratings).filter(db.Ratings.id == book_id).first()
-    entries, random, pagination = calibre_db.fill_indexpage(page, 0,
-                                                            db.Books,
-                                                            db.Books.ratings.any(db.Ratings.id == book_id),
-                                                            [order[0][0]],
-                                                            True, config.config_read_column)
-    if name and name.rating <= 10:
+    if book_id == '-1':
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Books.ratings == None,
+                                                                [order[0][0]],
+                                                                True, config.config_read_column,
+                                                                db.books_series_link,
+                                                                db.Books.id == db.books_series_link.c.book,
+                                                                db.Series)
+        title = _(u"Rating: None")
+        rating = -1
+    else:
+        name = calibre_db.session.query(db.Ratings).filter(db.Ratings.id == book_id).first()
+        entries, random, pagination = calibre_db.fill_indexpage(page, 0,
+                                                                db.Books,
+                                                                db.Books.ratings.any(db.Ratings.id == book_id),
+                                                                [order[0][0]],
+                                                                True, config.config_read_column)
+        title = _(u"Rating: %(rating)s stars", rating=int(name.rating / 2))
+        rating = name.rating
+    if title and rating <= 10:
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
-                                     title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)),
-                                     page="ratings",
-                                     order=order[1])
+                                     title=title, page="ratings", order=order[1])
     else:
         abort(404)
 
@@ -1001,6 +1013,7 @@ def publisher_list():
                            .count())
         if no_publisher_count:
             entries.append([db.Category(_("None"), "-1"), no_publisher_count])
+        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
@@ -1030,6 +1043,7 @@ def series_list():
                             .count())
             if no_series_count:
                 entries.append([db.Category(_("None"), "-1"), no_series_count])
+            entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
             return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
@@ -1060,10 +1074,11 @@ def ratings_list():
             .group_by(text('books_ratings_link.rating')).order_by(order).all()
         no_rating_count = (calibre_db.session.query(db.Books)
                            .outerjoin(db.books_ratings_link).outerjoin(db.Ratings)
-                           .filter(db.Ratings.name == None)
+                           .filter(db.Ratings.rating == None)
                            .filter(calibre_db.common_filters())
                            .count())
-        entries.append([db.Category(_("None"), "-1"), no_rating_count])
+        entries.append([db.Category(_("None"), "-1", -1), no_rating_count])
+        entries = sorted(entries, key=lambda x: x[0].rating, reverse=not order_no)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
                                      title=_(u"Ratings list"), page="ratingslist", data="ratings", order=order_no)
     else:
@@ -1130,6 +1145,7 @@ def category_list():
                          .count())
         if no_tag_count:
             entries.append([db.Category(_("None"), "-1"), no_tag_count])
+        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 392fdbea..d384225f 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-04-03 07:19:10</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-18 20:29:19</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>2022-04-03 12:55:38</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-19 07:55:03</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>4h 47 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>10h 36 min</p>
         </div>
       </div>
       </div>
@@ -102,15 +102,15 @@
     </tr>
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestAnonymous</td>
-        <td class="text-center">13</td>
-        <td class="text-center">13</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">18</td>
+        <td class="text-center">5</td>
+        <td class="text-center">6</td>
+        <td class="text-center">7</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c1', 13)">Detail</a>
+            <a onclick="showClassDetail('c1', 18)">Detail</a>
         </td>
     </tr>
 
@@ -134,11 +134,33 @@
     
     
     
-        <tr id='pt1.3' class='hiddenRow bg-success'>
+        <tr id="ft1.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</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_ft1.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 405, in test_guest_change_visibility_category
+    self.assertEqual(books[0][&#39;title&#39;], &#39;Gênot&#39;)
+AssertionError: &#39;None&#39; != &#39;Gênot&#39;
+- None
++ Gênot</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -161,20 +183,64 @@
     
     
     
-        <tr id='pt1.6' class='hiddenRow bg-success'>
+        <tr id="ft1.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</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_ft1.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 259, in test_guest_change_visibility_language
+    self.assertEqual(books[1][&#39;id&#39;], &#39;eng&#39;)
+AssertionError: &#39;none&#39; != &#39;eng&#39;
+- none
++ eng</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.7' class='hiddenRow bg-success'>
+        <tr id="ft1.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</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_ft1.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 322, in test_guest_change_visibility_publisher
+    self.assertEqual(books[0][&#39;title&#39;], &#39;Randomhäus&#39;)
+AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
+- None
++ Randomhäus</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -188,67 +254,368 @@
     
     
     
-        <tr id='pt1.9' class='hiddenRow bg-success'>
+        <tr id="et1.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</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_et1.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 364, in test_guest_change_visibility_rating
+    self.assertEqual(books[1][&#39;id&#39;], &#39;2&#39;)
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.10' class='hiddenRow bg-success'>
+        <tr id="et1.10" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft1.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</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_ft1.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 289, in test_guest_change_visibility_series
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.11' class='hiddenRow bg-success'>
+        <tr id="et1.12" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft1.13" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_random_books_available</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_ft1.13')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 54, in test_guest_random_books_available
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;books_rand&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.12' class='hiddenRow bg-success'>
+        <tr id="et1.14" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et1.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</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_et1.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 384, in test_guest_restricted_settings_visibility
+    self.assertIsNone(rights[&#39;show_512&#39;])
+TypeError: &#39;bool&#39; object is not subscriptable</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt1.13' class='hiddenRow bg-success'>
+        <tr id="et1.16" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft1.17" class="none bg-danger">
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</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_ft1.17')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft1.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 135, in test_guest_visibility_sidebar
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et1.18" class="none bg-info">
+            <td>
+                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.18')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et1.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
+    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
-        <td>TestCli</td>
-        <td class="text-center">9</td>
-        <td class="text-center">9</td>
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c2', 9)">Detail</a>
+            <a onclick="showClassDetail('c2', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt2.1' class='hiddenRow bg-success'>
+        <tr id="et2.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_anonymous)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et2.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et2.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 26, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestCli</td>
+        <td class="text-center">9</td>
+        <td class="text-center">4</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c3', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_already_started</div>
             </td>
@@ -257,34 +624,121 @@
     
     
     
-        <tr id='pt2.2' class='hiddenRow bg-success'>
+        <tr id="ft3.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_bind_to_single_interface</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_ft3.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 316, in test_bind_to_single_interface
+    self.assertTrue(re.findall(&#39;Reached error page:\sabout:neterror\?e=connectionFailure&#39;, error))
+AssertionError: [] is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.3' class='hiddenRow bg-success'>
+        <tr id="ft3.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_change_password</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_ft3.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 446, in test_change_password
+    self.login(&#34;admin&#34;, &#34;adm:in12&#34;)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 453, in test_change_password
+    self.assertFalse(e)
+AssertionError: TimeoutException(&#39;&#39;, None, [&#39;WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5&#39;, &#39;NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5&#39;, &#39;element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16&#39;, &#39;&#39;]) is not false</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.4' class='hiddenRow bg-success'>
+        <tr id="ft3.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_cli_SSL_files</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_ft3.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 280, in test_cli_SSL_files
+    self.driver.get(&#34;https://127.0.0.1:8083&#34;)
+selenium.common.exceptions.WebDriverException: Message: Reached error page: about:neterror?e=netTimeout&amp;u=https%3A//127.0.0.1%3A8083/&amp;c=UTF-8&amp;d=The%20server%20at%20127.0.0.1%20is%20taking%20too%20long%20to%20respond.
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+UnknownError@chrome://remote/content/shared/webdriver/Errors.jsm:510:5
+checkReadyState@chrome://remote/content/marionette/navigate.js:64:24
+onNavigation@chrome://remote/content/marionette/navigate.js:312:39
+emit@resource://gre/modules/EventEmitter.jsm:160:20
+receiveMessage@chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm:44:25
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 282, in test_cli_SSL_files
+    self.assertIsNone(&#34;Error&#34;, &#34;HTTPS Connection could not established with key/cert file&#34;)
+AssertionError: &#39;Error&#39; is not None : HTTPS Connection could not established with key/cert file</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.5' class='hiddenRow bg-success'>
+        <tr id='pt3.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_different_folder</div>
             </td>
@@ -293,16 +747,46 @@
     
     
     
-        <tr id='pt2.6' class='hiddenRow bg-success'>
+        <tr id="et3.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestCli - test_cli_different_settings_database</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_et3.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et3.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et3.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 125, in test_cli_different_settings_database
+    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 223, in fill_db_config
+    cls.login(&#39;admin&#39;, &#39;admin123&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 87, in login
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt2.7' class='hiddenRow bg-success'>
+        <tr id='pt3.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_dryrun_update</div>
             </td>
@@ -311,7 +795,7 @@
     
     
     
-        <tr id='pt2.8' class='hiddenRow bg-success'>
+        <tr id='pt3.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_environ_port_setting</div>
             </td>
@@ -320,11 +804,43 @@
     
     
     
-        <tr id='pt2.9' class='hiddenRow bg-success'>
+        <tr id="ft3.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</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_ft3.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft3.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 408, in test_settingsdb_not_writeable
+    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
+
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 413, in test_settingsdb_not_writeable
+    self.assertFalse(True, &#34;Inital config failed with nonwriteable database&#34;)
+AssertionError: True is not false : Inital config failed with nonwriteable database</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -332,19 +848,28 @@
 
     <tr id="su" class="passClass">
         <td>TestCliGdrivedb</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('c3', 2)">Detail</a>
+            <a onclick="showClassDetail('c4', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt3.1' class='hiddenRow bg-success'>
+        <tr id='pt4.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt4.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
@@ -353,7 +878,7 @@
     
     
     
-        <tr id='pt3.2' class='hiddenRow bg-success'>
+        <tr id='pt4.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
@@ -371,13 +896,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c4', 2)">Detail</a>
+            <a onclick="showClassDetail('c5', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt4.1' class='hiddenRow bg-success'>
+        <tr id='pt5.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_invalid_jpg_hdd</div>
             </td>
@@ -386,7 +911,7 @@
     
     
     
-        <tr id='pt4.2' class='hiddenRow bg-success'>
+        <tr id='pt5.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
@@ -396,25 +921,45 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestDeleteDatabase</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c5', 1)">Detail</a>
+            <a onclick="showClassDetail('c6', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt5.1' class='hiddenRow bg-success'>
+        <tr id="ft6.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</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_ft6.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_delete_database.py&#34;, line 70, in test_delete_books_in_database
+    self.assertEqual(0, len(list_element))
+AssertionError: 0 != 1</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -428,13 +973,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c6', 15)">Detail</a>
+            <a onclick="showClassDetail('c7', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt6.1' class='hiddenRow bg-success'>
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
@@ -443,7 +988,7 @@
     
     
     
-        <tr id='pt6.2' class='hiddenRow bg-success'>
+        <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
@@ -452,7 +997,7 @@
     
     
     
-        <tr id='pt6.3' class='hiddenRow bg-success'>
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
@@ -461,7 +1006,7 @@
     
     
     
-        <tr id='pt6.4' class='hiddenRow bg-success'>
+        <tr id='pt7.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
@@ -470,7 +1015,7 @@
     
     
     
-        <tr id='pt6.5' class='hiddenRow bg-success'>
+        <tr id='pt7.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -479,7 +1024,7 @@
     
     
     
-        <tr id='pt6.6' class='hiddenRow bg-success'>
+        <tr id='pt7.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -488,7 +1033,7 @@
     
     
     
-        <tr id='pt6.7' class='hiddenRow bg-success'>
+        <tr id='pt7.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
@@ -497,7 +1042,7 @@
     
     
     
-        <tr id='pt6.8' class='hiddenRow bg-success'>
+        <tr id='pt7.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
@@ -506,7 +1051,7 @@
     
     
     
-        <tr id='pt6.9' class='hiddenRow bg-success'>
+        <tr id='pt7.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
@@ -515,7 +1060,7 @@
     
     
     
-        <tr id='pt6.10' class='hiddenRow bg-success'>
+        <tr id='pt7.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
@@ -524,7 +1069,7 @@
     
     
     
-        <tr id='pt6.11' class='hiddenRow bg-success'>
+        <tr id='pt7.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
@@ -533,7 +1078,7 @@
     
     
     
-        <tr id='pt6.12' class='hiddenRow bg-success'>
+        <tr id='pt7.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -542,7 +1087,7 @@
     
     
     
-        <tr id='pt6.13' class='hiddenRow bg-success'>
+        <tr id='pt7.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -551,7 +1096,7 @@
     
     
     
-        <tr id='pt6.14' class='hiddenRow bg-success'>
+        <tr id='pt7.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -560,7 +1105,7 @@
     
     
     
-        <tr id='pt6.15' class='hiddenRow bg-success'>
+        <tr id='pt7.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
@@ -578,13 +1123,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 6)">Detail</a>
+            <a onclick="showClassDetail('c8', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
@@ -593,7 +1138,7 @@
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
             </td>
@@ -602,7 +1147,7 @@
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
@@ -611,7 +1156,7 @@
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id='pt8.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
             </td>
@@ -620,7 +1165,7 @@
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id='pt8.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
             </td>
@@ -629,7 +1174,7 @@
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id='pt8.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
@@ -647,13 +1192,13 @@
         <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('c9', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt8.1' class='hiddenRow bg-success'>
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
             </td>
@@ -662,7 +1207,7 @@
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
@@ -671,7 +1216,7 @@
     
     
     
-        <tr id='pt8.3' class='hiddenRow bg-success'>
+        <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -689,13 +1234,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 3)">Detail</a>
+            <a onclick="showClassDetail('c10', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</div>
             </td>
@@ -704,7 +1249,7 @@
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
@@ -713,7 +1258,7 @@
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -731,13 +1276,13 @@
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 17)">Detail</a>
+            <a onclick="showClassDetail('c11', 17)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
@@ -746,7 +1291,7 @@
     
     
     
-        <tr id='pt10.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
@@ -755,7 +1300,7 @@
     
     
     
-        <tr id='pt10.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
@@ -764,7 +1309,7 @@
     
     
     
-        <tr id='pt10.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
@@ -773,7 +1318,7 @@
     
     
     
-        <tr id='pt10.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
@@ -782,7 +1327,7 @@
     
     
     
-        <tr id='pt10.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
@@ -791,7 +1336,7 @@
     
     
     
-        <tr id='pt10.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
@@ -800,7 +1345,7 @@
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
@@ -809,7 +1354,7 @@
     
     
     
-        <tr id='pt10.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -818,7 +1363,7 @@
     
     
     
-        <tr id='pt10.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
@@ -827,7 +1372,7 @@
     
     
     
-        <tr id='pt10.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -836,7 +1381,7 @@
     
     
     
-        <tr id='pt10.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -845,7 +1390,7 @@
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -854,7 +1399,7 @@
     
     
     
-        <tr id='pt10.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -863,7 +1408,7 @@
     
     
     
-        <tr id='st10.15' class='none bg-warning'>
+        <tr id='st11.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -872,7 +1417,7 @@
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -881,7 +1426,7 @@
     
     
     
-        <tr id='pt10.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -899,13 +1444,13 @@
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 36)">Detail</a>
+            <a onclick="showClassDetail('c12', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -914,7 +1459,7 @@
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -923,7 +1468,7 @@
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -932,7 +1477,7 @@
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -941,7 +1486,7 @@
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -950,7 +1495,7 @@
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -959,7 +1504,7 @@
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -968,7 +1513,7 @@
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -977,7 +1522,7 @@
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -986,7 +1531,7 @@
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -995,7 +1540,7 @@
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1004,7 +1549,7 @@
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1013,7 +1558,7 @@
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1022,7 +1567,7 @@
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1031,7 +1576,7 @@
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1040,7 +1585,7 @@
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1049,7 +1594,7 @@
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1058,7 +1603,7 @@
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1067,7 +1612,7 @@
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1076,19 +1621,19 @@
     
     
     
-        <tr id="st11.20" class="none bg-warning">
+        <tr id="st12.20" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st12.20" 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.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1102,7 +1647,7 @@
     
     
     
-        <tr id='pt11.21' class='hiddenRow bg-success'>
+        <tr id='pt12.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1111,7 +1656,7 @@
     
     
     
-        <tr id='pt11.22' class='hiddenRow bg-success'>
+        <tr id='pt12.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1120,7 +1665,7 @@
     
     
     
-        <tr id='pt11.23' class='hiddenRow bg-success'>
+        <tr id='pt12.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1129,7 +1674,7 @@
     
     
     
-        <tr id='pt11.24' class='hiddenRow bg-success'>
+        <tr id='pt12.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1138,7 +1683,7 @@
     
     
     
-        <tr id='pt11.25' class='hiddenRow bg-success'>
+        <tr id='pt12.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1147,7 +1692,7 @@
     
     
     
-        <tr id='pt11.26' class='hiddenRow bg-success'>
+        <tr id='pt12.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1156,7 +1701,7 @@
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1165,7 +1710,7 @@
     
     
     
-        <tr id='pt11.28' class='hiddenRow bg-success'>
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1174,7 +1719,7 @@
     
     
     
-        <tr id='pt11.29' class='hiddenRow bg-success'>
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1183,7 +1728,7 @@
     
     
     
-        <tr id='pt11.30' class='hiddenRow bg-success'>
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1192,7 +1737,7 @@
     
     
     
-        <tr id='pt11.31' class='hiddenRow bg-success'>
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1201,7 +1746,7 @@
     
     
     
-        <tr id='pt11.32' class='hiddenRow bg-success'>
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1210,7 +1755,7 @@
     
     
     
-        <tr id='pt11.33' class='hiddenRow bg-success'>
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1219,7 +1764,7 @@
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1228,7 +1773,7 @@
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id='pt12.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1237,7 +1782,7 @@
     
     
     
-        <tr id='pt11.36' class='hiddenRow bg-success'>
+        <tr id='pt12.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1255,13 +1800,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 6)">Detail</a>
+            <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
             </td>
@@ -1270,7 +1815,7 @@
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
             </td>
@@ -1279,7 +1824,7 @@
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
             </td>
@@ -1288,7 +1833,7 @@
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
             </td>
@@ -1297,7 +1842,7 @@
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1306,7 +1851,7 @@
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
             </td>
@@ -1324,13 +1869,13 @@
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 6)">Detail</a>
+            <a onclick="showClassDetail('c14', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
@@ -1339,7 +1884,7 @@
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
@@ -1348,7 +1893,7 @@
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
             </td>
@@ -1357,7 +1902,7 @@
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
@@ -1366,7 +1911,7 @@
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1375,7 +1920,7 @@
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
@@ -1385,21 +1930,21 @@
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">14</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 18)">Detail</a>
+            <a onclick="showClassDetail('c15', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1408,16 +1953,36 @@
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id="ft15.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</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_ft15.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 155, in test_bookslist_edit_categories
+    self.assertEqual(2, len(elements))
+AssertionError: 2 != 3</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1426,7 +1991,7 @@
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1435,7 +2000,7 @@
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1444,7 +2009,7 @@
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1453,7 +2018,7 @@
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1462,7 +2027,7 @@
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1471,7 +2036,7 @@
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1480,7 +2045,7 @@
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1489,25 +2054,65 @@
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id="ft15.11" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</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_ft15.11')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 231, in test_bookslist_edit_languages
+    self.assertEqual(4, len(elements))
+AssertionError: 4 != 5</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id="ft15.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</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_ft15.12')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 205, in test_bookslist_edit_publisher
+    self.assertEqual(2, len(elements))
+AssertionError: 2 != 3</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1516,7 +2121,7 @@
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1525,7 +2130,7 @@
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1534,7 +2139,7 @@
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1543,7 +2148,7 @@
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1552,52 +2157,72 @@
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id="ft15.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</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_ft15.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft15.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft15.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 51, in test_search_books_list
+    bl = self.check_search(bl, &#34;genot&#34;, 4, &#34;Categories&#34;, &#34;Gênot&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 43, in check_search
+    self.assertEqual(count, len(bl[&#39;table&#39;]))
+AssertionError: 4 != 5</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="errorClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft15.1" class="none bg-danger">
+        <tr id="et16.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.1" class="popup_window test_output" style="display:block;">
+                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.1').style.display='none'"><span
+                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 235, in test_load_metadata
-    self.assertEqual(&#34;奇想西遊記1&#34;, results[3][&#39;title&#39;])
-AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
-- 奇想西遊記1
-+ 巧讀西遊記</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 63, in test_load_metadata
+    if &#39;https://comicvine.gamespot.com/&#39; == results[10][&#39;source&#39;]:
+IndexError: list index out of range</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1616,13 +2241,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 18)">Detail</a>
+            <a onclick="showClassDetail('c17', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1631,7 +2256,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1640,7 +2265,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1649,7 +2274,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1658,7 +2283,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1667,7 +2292,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1676,7 +2301,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1685,7 +2310,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.8' class='hiddenRow bg-success'>
+        <tr id='pt17.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1694,7 +2319,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id='pt17.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1703,7 +2328,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.10' class='hiddenRow bg-success'>
+        <tr id='pt17.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -1712,7 +2337,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.11' class='hiddenRow bg-success'>
+        <tr id='pt17.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -1721,7 +2346,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.12' class='hiddenRow bg-success'>
+        <tr id='pt17.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -1730,7 +2355,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.13' class='hiddenRow bg-success'>
+        <tr id='pt17.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -1739,7 +2364,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.14' class='hiddenRow bg-success'>
+        <tr id='pt17.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -1748,7 +2373,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.15' class='hiddenRow bg-success'>
+        <tr id='pt17.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -1757,7 +2382,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id='pt17.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -1766,7 +2391,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.17' class='hiddenRow bg-success'>
+        <tr id='pt17.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -1775,7 +2400,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id='pt17.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -1785,25 +2410,45 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id="ft18.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</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_ft18.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
+    self.assertEqual(30, len(results))
+AssertionError: 30 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1817,13 +2462,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 3)">Detail</a>
+            <a onclick="showClassDetail('c19', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -1832,7 +2477,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -1841,7 +2486,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -1859,13 +2504,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 7)">Detail</a>
+            <a onclick="showClassDetail('c20', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -1874,7 +2519,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -1883,7 +2528,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -1892,7 +2537,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.4' class='hiddenRow bg-success'>
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -1901,7 +2546,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -1910,7 +2555,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -1919,7 +2564,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -1937,13 +2582,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -1961,13 +2606,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 2)">Detail</a>
+            <a onclick="showClassDetail('c22', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -1976,7 +2621,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -1994,13 +2639,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2009,19 +2654,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st22.2" class="none bg-warning">
+        <tr id="st23.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.2" 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_st22.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st23.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2035,7 +2680,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2053,13 +2698,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 1)">Detail</a>
+            <a onclick="showClassDetail('c24', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2077,13 +2722,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 3)">Detail</a>
+            <a onclick="showClassDetail('c25', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2092,7 +2737,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2101,7 +2746,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2111,30 +2756,52 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">11</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id="ft26.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</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_ft26.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft26.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 581, in test_book_download
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 168, in inital_sync
+    self.assertEqual(r.status_code, 200)
+AssertionError: 404 != 200</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2143,7 +2810,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2152,7 +2819,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2161,7 +2828,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2170,7 +2837,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2179,7 +2846,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2188,7 +2855,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2197,7 +2864,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2206,7 +2873,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2215,7 +2882,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2233,13 +2900,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
+            <a onclick="showClassDetail('c27', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2248,7 +2915,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2257,7 +2924,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2266,7 +2933,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2275,7 +2942,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2293,13 +2960,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 13)">Detail</a>
+            <a onclick="showClassDetail('c28', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2308,7 +2975,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2317,7 +2984,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2326,7 +2993,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2335,7 +3002,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2344,7 +3011,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2353,7 +3020,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -2362,7 +3029,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -2371,7 +3038,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -2380,7 +3047,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -2389,7 +3056,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -2398,7 +3065,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -2407,7 +3074,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -2417,21 +3084,21 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCalibreWebListOrders</td>
         <td class="text-center">10</td>
-        <td class="text-center">10</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 10)">Detail</a>
+            <a onclick="showClassDetail('c29', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -2440,7 +3107,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -2449,7 +3116,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -2458,16 +3125,36 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id="ft29.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</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_ft29.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 194, in test_lang_sort
+    self.assertEqual(len(list_element), 3)
+AssertionError: 4 != 3</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -2476,7 +3163,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -2485,38 +3172,120 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id="ft29.7" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</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_ft29.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 161, in test_publisher_sort
+    self.assertEqual(list_element[0][&#39;title&#39;], &#34;Randomhäus&#34;)
+AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
+- None
++ Randomhäus</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id="et29.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</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_et29.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et29.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et29.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 239, in test_ratings_sort
+    self.assertEqual(list_element[0][&#39;title&#39;], &#34;2&#34;)
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id="ft29.9" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</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_ft29.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 39, in test_series_sort
+    self.assertTrue(list)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id="ft29.10" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</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_ft29.10')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft29.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft29.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 222, in test_tags_sort
+    self.assertEqual(len(list_element), 2)
+AssertionError: 3 != 2</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2530,13 +3299,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 9)">Detail</a>
+            <a onclick="showClassDetail('c30', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -2545,7 +3314,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -2554,7 +3323,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -2563,7 +3332,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -2572,19 +3341,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st29.5" class="none bg-warning">
+        <tr id="st30.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st29.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st30.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_st29.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st30.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2598,7 +3367,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -2607,7 +3376,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -2616,7 +3385,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -2625,7 +3394,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -2643,13 +3412,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c31', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -2658,7 +3427,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -2667,7 +3436,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -2676,7 +3445,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -2685,7 +3454,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -2694,7 +3463,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -2703,7 +3472,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -2712,7 +3481,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -2721,7 +3490,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -2730,7 +3499,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -2739,7 +3508,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2748,7 +3517,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2757,7 +3526,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2766,7 +3535,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -2775,7 +3544,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2793,13 +3562,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -2808,7 +3577,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -2826,13 +3595,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c33', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2841,7 +3610,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2859,13 +3628,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 23)">Detail</a>
+            <a onclick="showClassDetail('c34', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2874,7 +3643,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2883,7 +3652,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -2892,7 +3661,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2901,7 +3670,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -2910,7 +3679,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2919,7 +3688,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2928,7 +3697,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2937,7 +3706,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2946,7 +3715,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2955,7 +3724,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.11' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2964,7 +3733,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2973,7 +3742,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2982,7 +3751,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.14' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2991,7 +3760,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id='pt34.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3000,7 +3769,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.16' class='hiddenRow bg-success'>
+        <tr id='pt34.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3009,7 +3778,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id='pt34.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3018,7 +3787,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id='pt34.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3027,7 +3796,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.19' class='hiddenRow bg-success'>
+        <tr id='pt34.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3036,7 +3805,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id='pt34.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3045,7 +3814,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.21' class='hiddenRow bg-success'>
+        <tr id='pt34.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3054,7 +3823,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.22' class='hiddenRow bg-success'>
+        <tr id='pt34.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3063,7 +3832,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt33.23' class='hiddenRow bg-success'>
+        <tr id='pt34.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3081,13 +3850,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3097,6 +3866,48 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestPipInstall</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('c36', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt36.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_command_start</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt36.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_module_start</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
@@ -3105,13 +3916,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 5)">Detail</a>
+            <a onclick="showClassDetail('c37', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3120,7 +3931,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.2' class='hiddenRow bg-success'>
+        <tr id='pt37.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3129,7 +3940,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.3' class='hiddenRow bg-success'>
+        <tr id='pt37.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3138,7 +3949,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.4' class='hiddenRow bg-success'>
+        <tr id='pt37.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3147,7 +3958,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3165,13 +3976,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -3189,13 +4000,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 1)">Detail</a>
+            <a onclick="showClassDetail('c39', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3213,13 +4024,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 8)">Detail</a>
+            <a onclick="showClassDetail('c40', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3228,7 +4039,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3237,7 +4048,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3246,7 +4057,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3255,7 +4066,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3264,7 +4075,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3273,7 +4084,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3282,7 +4093,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt38.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3300,13 +4111,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 3)">Detail</a>
+            <a onclick="showClassDetail('c41', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3315,7 +4126,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3324,7 +4135,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3342,13 +4153,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 16)">Detail</a>
+            <a onclick="showClassDetail('c42', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3357,7 +4168,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3366,7 +4177,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3375,7 +4186,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -3384,7 +4195,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -3393,7 +4204,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -3402,7 +4213,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -3411,7 +4222,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -3420,7 +4231,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -3429,7 +4240,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -3438,7 +4249,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -3447,7 +4258,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -3456,7 +4267,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -3465,19 +4276,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st40.14" class="none bg-warning">
+        <tr id="st42.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.14" 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_st40.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3491,7 +4302,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -3500,7 +4311,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt40.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -3518,13 +4329,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 9)">Detail</a>
+            <a onclick="showClassDetail('c43', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -3533,7 +4344,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -3542,7 +4353,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -3551,7 +4362,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.4' class='hiddenRow bg-success'>
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -3560,7 +4371,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.5' class='hiddenRow bg-success'>
+        <tr id='pt43.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -3569,7 +4380,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -3578,19 +4389,19 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id="st41.7" class="none bg-warning">
+        <tr id="st43.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st43.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st41.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st43.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_st41.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st43.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3604,7 +4415,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.8' class='hiddenRow bg-success'>
+        <tr id='pt43.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -3613,7 +4424,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt41.9' class='hiddenRow bg-success'>
+        <tr id='pt43.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -3623,21 +4434,21 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">4</td>
-        <td class="text-center">4</td>
-        <td class="text-center">0</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 4)">Detail</a>
+            <a onclick="showClassDetail('c44', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -3646,7 +4457,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -3655,7 +4466,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -3664,11 +4475,33 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id="ft44.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</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_ft44.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 92, in test_upload_epub_lang
+    self.assertEqual(&#39;Tedesco&#39;, list_element[2].text)
+AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
+- Tedesco
++ Norvegese bokmål</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3682,13 +4515,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 18)">Detail</a>
+            <a onclick="showClassDetail('c45', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -3697,7 +4530,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt45.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -3706,7 +4539,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -3715,7 +4548,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -3724,7 +4557,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt45.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -3733,7 +4566,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt45.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -3742,7 +4575,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.7' class='hiddenRow bg-success'>
+        <tr id='pt45.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -3751,7 +4584,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt45.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -3760,7 +4593,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt45.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -3769,7 +4602,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.10' class='hiddenRow bg-success'>
+        <tr id='pt45.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -3778,7 +4611,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.11' class='hiddenRow bg-success'>
+        <tr id='pt45.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -3787,7 +4620,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.12' class='hiddenRow bg-success'>
+        <tr id='pt45.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -3796,7 +4629,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.13' class='hiddenRow bg-success'>
+        <tr id='pt45.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -3805,7 +4638,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.14' class='hiddenRow bg-success'>
+        <tr id='pt45.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -3814,7 +4647,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.15' class='hiddenRow bg-success'>
+        <tr id='pt45.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -3823,7 +4656,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.16' class='hiddenRow bg-success'>
+        <tr id='pt45.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -3832,7 +4665,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.17' class='hiddenRow bg-success'>
+        <tr id='pt45.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -3841,7 +4674,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt43.18' class='hiddenRow bg-success'>
+        <tr id='pt45.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -3859,13 +4692,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 1)">Detail</a>
+            <a onclick="showClassDetail('c46', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -3883,13 +4716,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 21)">Detail</a>
+            <a onclick="showClassDetail('c47', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -3898,7 +4731,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -3907,7 +4740,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -3916,7 +4749,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -3925,7 +4758,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -3934,7 +4767,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -3943,7 +4776,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -3952,7 +4785,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -3961,7 +4794,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -3970,7 +4803,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -3979,7 +4812,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -3988,7 +4821,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -3997,7 +4830,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4006,7 +4839,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4015,7 +4848,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4024,7 +4857,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4033,7 +4866,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4042,7 +4875,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4051,7 +4884,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4060,7 +4893,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4069,7 +4902,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4079,21 +4912,21 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">35</td>
-        <td class="text-center">35</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">30</td>
+        <td class="text-center">1</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 35)">Detail</a>
+            <a onclick="showClassDetail('c48', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4102,7 +4935,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4111,7 +4944,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4120,7 +4953,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4129,7 +4962,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4138,7 +4971,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4147,7 +4980,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4156,7 +4989,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4165,7 +4998,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4174,7 +5007,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4183,7 +5016,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4192,7 +5025,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4201,7 +5034,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4210,52 +5043,186 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id="et48.14" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</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_et48.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 349, in test_admin_change_visibility_rating
+    self.verify_order(&#34;nav_rate&#34;, 0, order=order)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1332, in verify_order
+    list_elements[index][&#39;ele&#39;].click()
+IndexError: list index out of range</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id="et48.15" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</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_et48.15')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.15" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 196, in test_admin_change_visibility_read
+    self.change_user({&#39;show_256&#39;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_256&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id="et48.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</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_et48.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 290, in test_admin_change_visibility_series
+    self.change_user({&#39;show_4&#39;: 0})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_4&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.17' class='hiddenRow bg-success'>
+        <tr id="et48.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</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_et48.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et48.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 733, in test_allow_columns
+    self.fill_view_config({&#39;config_restricted_column&#39;: &#34;Custom Text 人物 *&#39;()&amp;&#34;})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 363, in fill_view_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, &#34;discover&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.18' class='hiddenRow bg-success'>
+        <tr id="ft48.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</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_ft48.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft48.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 596, in test_allow_tags
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt46.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4264,7 +5231,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4273,7 +5240,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4282,7 +5249,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.22' class='hiddenRow bg-success'>
+        <tr id='pt48.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4291,7 +5258,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.23' class='hiddenRow bg-success'>
+        <tr id='pt48.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4300,7 +5267,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.24' class='hiddenRow bg-success'>
+        <tr id='pt48.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -4309,7 +5276,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.25' class='hiddenRow bg-success'>
+        <tr id='pt48.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -4318,7 +5285,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.26' class='hiddenRow bg-success'>
+        <tr id='pt48.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -4327,7 +5294,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.27' class='hiddenRow bg-success'>
+        <tr id='pt48.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -4336,7 +5303,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.28' class='hiddenRow bg-success'>
+        <tr id='pt48.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -4345,7 +5312,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.29' class='hiddenRow bg-success'>
+        <tr id='pt48.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -4354,7 +5321,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.30' class='hiddenRow bg-success'>
+        <tr id='pt48.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -4363,7 +5330,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.31' class='hiddenRow bg-success'>
+        <tr id='pt48.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -4372,7 +5339,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.32' class='hiddenRow bg-success'>
+        <tr id='pt48.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -4381,7 +5348,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.33' class='hiddenRow bg-success'>
+        <tr id='pt48.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -4390,7 +5357,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.34' class='hiddenRow bg-success'>
+        <tr id='pt48.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -4399,7 +5366,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt46.35' class='hiddenRow bg-success'>
+        <tr id='pt48.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -4417,13 +5384,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 16)">Detail</a>
+            <a onclick="showClassDetail('c49', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -4432,7 +5399,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -4441,7 +5408,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -4450,7 +5417,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -4459,7 +5426,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -4468,7 +5435,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -4477,7 +5444,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -4486,7 +5453,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -4495,7 +5462,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -4504,7 +5471,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -4513,7 +5480,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -4522,7 +5489,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -4531,7 +5498,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -4540,7 +5507,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -4549,7 +5516,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -4558,7 +5525,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -4569,10 +5536,10 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>406</td>
-        <td>399</td>
-        <td>1</td>
-        <td>0</td>
+        <td>416</td>
+        <td>372</td>
+        <td>23</td>
+        <td>15</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -4715,7 +5682,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.34</td>
+              <td>1.4.35</td>
               <td>Basic</td>
             </tr>
           
@@ -4745,7 +5712,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -4775,7 +5742,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -4805,7 +5772,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -4847,7 +5814,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -4877,13 +5844,13 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadata</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -4913,7 +5880,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
@@ -4925,7 +5892,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.42.0</td>
+              <td>2.44.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -4997,7 +5964,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
           
             <tr>
               <th>Flask-Dance</th>
-              <td>5.1.0</td>
+              <td>6.0.0</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -5015,7 +5982,7 @@ AssertionError: &#39;奇想西遊記1&#39; != &#39;巧讀西遊記&#39;
 </div>
 
 <script>
-    drawCircle(399, 1, 0, 6);
+    drawCircle(372, 23, 15, 6);
     showCase(5);
 </script>
 

From 2303fc08148de0bb09d1a41e88da314de0b6f9de Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Wed, 20 Apr 2022 07:05:22 +0200
Subject: [PATCH 196/220] Updated requirements Update after testrun

---
 requirements.txt                        |    2 +-
 setup.cfg                               |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 1988 +++++++----------------
 3 files changed, 570 insertions(+), 1422 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7b03ffe4..81320aa3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 werkzeug<2.1.0
 Babel>=1.3,<3.0
 Flask-Babel>=0.11.1,<2.1.0
-Flask-Login>=0.3.2,<0.5.1
+Flask-Login>=0.3.2,<0.6.1
 Flask-Principal>=0.3.2,<0.5.1
 backports_abc>=0.4
 Flask>=1.0.2,<2.1.0
diff --git a/setup.cfg b/setup.cfg
index e9c23604..251d9db0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -41,7 +41,7 @@ install_requires =
 	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
-	Flask-Login>=0.3.2,<0.5.1
+	Flask-Login>=0.3.2,<0.6.1
 	Flask-Principal>=0.3.2,<0.5.1
 	backports_abc>=0.4
 	Flask>=1.0.2,<2.1.0
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index d384225f..1c874a62 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-04-18 20:29:19</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-19 20:47:12</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>2022-04-19 07:55:03</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-20 02:31:36</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>10h 36 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 53 min</p>
         </div>
       </div>
       </div>
@@ -102,15 +102,15 @@
     </tr>
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestAnonymous</td>
-        <td class="text-center">18</td>
-        <td class="text-center">5</td>
-        <td class="text-center">6</td>
-        <td class="text-center">7</td>
+        <td class="text-center">13</td>
+        <td class="text-center">13</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', 18)">Detail</a>
+            <a onclick="showClassDetail('c1', 13)">Detail</a>
         </td>
     </tr>
 
@@ -134,33 +134,11 @@
     
     
     
-        <tr id="ft1.3" class="none bg-danger">
+        <tr id='pt1.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_category</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 405, in test_guest_change_visibility_category
-    self.assertEqual(books[0][&#39;title&#39;], &#39;Gênot&#39;)
-AssertionError: &#39;None&#39; != &#39;Gênot&#39;
-- None
-+ Gênot</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -183,64 +161,20 @@ AssertionError: &#39;None&#39; != &#39;Gênot&#39;
     
     
     
-        <tr id="ft1.6" class="none bg-danger">
+        <tr id='pt1.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_language</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 259, in test_guest_change_visibility_language
-    self.assertEqual(books[1][&#39;id&#39;], &#39;eng&#39;)
-AssertionError: &#39;none&#39; != &#39;eng&#39;
-- none
-+ eng</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft1.7" class="none bg-danger">
+        <tr id='pt1.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_publisher</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 322, in test_guest_change_visibility_publisher
-    self.assertEqual(books[0][&#39;title&#39;], &#39;Randomhäus&#39;)
-AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
-- None
-+ Randomhäus</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -254,368 +188,67 @@ AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
     
     
     
-        <tr id="et1.9" class="none bg-info">
+        <tr id='pt1.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 364, in test_guest_change_visibility_rating
-    self.assertEqual(books[1][&#39;id&#39;], &#39;2&#39;)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et1.10" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_rating</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft1.11" class="none bg-danger">
+        <tr id='pt1.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 289, in test_guest_change_visibility_series
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id="et1.12" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_change_visibility_series</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft1.13" class="none bg-danger">
+        <tr id='pt1.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 54, in test_guest_random_books_available
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;books_rand&#34;)))
-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>
     
     
     
-        <tr id="et1.14" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_random_books_available</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et1.15" class="none bg-info">
+        <tr id='pt1.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 384, in test_guest_restricted_settings_visibility
-    self.assertIsNone(rights[&#39;show_512&#39;])
-TypeError: &#39;bool&#39; object is not subscriptable</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et1.16" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_restricted_settings_visibility</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft1.17" class="none bg-danger">
+        <tr id='pt1.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft1.17')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft1.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 135, in test_guest_visibility_sidebar
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et1.18" class="none bg-info">
-            <td>
-                <div class='testcase'>TestAnonymous - test_guest_visibility_sidebar</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et1.18')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et1.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et1.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 39, in tearDown
-    self.check_element_on_page((By.ID, &#34;top_user&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c2', 1)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et2.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_anonymous)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et2.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et2.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et2.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_anonymous.py&#34;, line 26, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 446, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCli</td>
         <td class="text-center">9</td>
-        <td class="text-center">4</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</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('c3', 9)">Detail</a>
+            <a onclick="showClassDetail('c2', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt3.1' class='hiddenRow bg-success'>
+        <tr id='pt2.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_already_started</div>
             </td>
@@ -624,121 +257,34 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft3.2" class="none bg-danger">
+        <tr id='pt2.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_bind_to_single_interface</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 316, in test_bind_to_single_interface
-    self.assertTrue(re.findall(&#39;Reached error page:\sabout:neterror\?e=connectionFailure&#39;, error))
-AssertionError: [] is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft3.3" class="none bg-danger">
+        <tr id='pt2.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_change_password</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 446, in test_change_password
-    self.login(&#34;admin&#34;, &#34;adm:in12&#34;)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 453, in test_change_password
-    self.assertFalse(e)
-AssertionError: TimeoutException(&#39;&#39;, None, [&#39;WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5&#39;, &#39;NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5&#39;, &#39;element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16&#39;, &#39;&#39;]) is not false</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft3.4" class="none bg-danger">
+        <tr id='pt2.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_SSL_files</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 280, in test_cli_SSL_files
-    self.driver.get(&#34;https://127.0.0.1:8083&#34;)
-selenium.common.exceptions.WebDriverException: Message: Reached error page: about:neterror?e=netTimeout&amp;u=https%3A//127.0.0.1%3A8083/&amp;c=UTF-8&amp;d=The%20server%20at%20127.0.0.1%20is%20taking%20too%20long%20to%20respond.
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-UnknownError@chrome://remote/content/shared/webdriver/Errors.jsm:510:5
-checkReadyState@chrome://remote/content/marionette/navigate.js:64:24
-onNavigation@chrome://remote/content/marionette/navigate.js:312:39
-emit@resource://gre/modules/EventEmitter.jsm:160:20
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteEventsParent.jsm:44:25
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 282, in test_cli_SSL_files
-    self.assertIsNone(&#34;Error&#34;, &#34;HTTPS Connection could not established with key/cert file&#34;)
-AssertionError: &#39;Error&#39; is not None : HTTPS Connection could not established with key/cert file</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt3.5' class='hiddenRow bg-success'>
+        <tr id='pt2.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_different_folder</div>
             </td>
@@ -747,46 +293,16 @@ AssertionError: &#39;Error&#39; is not None : HTTPS Connection could not establi
     
     
     
-        <tr id="et3.6" class="none bg-info">
+        <tr id='pt2.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_cli_different_settings_database</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et3.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et3.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et3.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 125, in test_cli_different_settings_database
-    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 223, in fill_db_config
-    cls.login(&#39;admin&#39;, &#39;admin123&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 87, in login
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;username&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt3.7' class='hiddenRow bg-success'>
+        <tr id='pt2.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_dryrun_update</div>
             </td>
@@ -795,7 +311,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt3.8' class='hiddenRow bg-success'>
+        <tr id='pt2.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_environ_port_setting</div>
             </td>
@@ -804,43 +320,11 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft3.9" class="none bg-danger">
+        <tr id='pt2.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft3.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft3.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft3.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 408, in test_settingsdb_not_writeable
-    self.fill_db_config({&#39;config_calibre_dir&#39;: TEST_DB})
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16
-
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_cli.py&#34;, line 413, in test_settingsdb_not_writeable
-    self.assertFalse(True, &#34;Inital config failed with nonwriteable database&#34;)
-AssertionError: True is not false : Inital config failed with nonwriteable database</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -854,13 +338,13 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c4', 3)">Detail</a>
+            <a onclick="showClassDetail('c3', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt4.1' class='hiddenRow bg-success'>
+        <tr id='pt3.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
             </td>
@@ -869,7 +353,7 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
     
     
-        <tr id='pt4.2' class='hiddenRow bg-success'>
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
@@ -878,7 +362,7 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
     
     
-        <tr id='pt4.3' class='hiddenRow bg-success'>
+        <tr id='pt3.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
@@ -896,13 +380,13 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
         <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('c4', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt5.1' class='hiddenRow bg-success'>
+        <tr id='pt4.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_invalid_jpg_hdd</div>
             </td>
@@ -911,7 +395,7 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
     
     
-        <tr id='pt5.2' class='hiddenRow bg-success'>
+        <tr id='pt4.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCoverEditBooks - test_upload_jpg</div>
             </td>
@@ -921,45 +405,25 @@ AssertionError: True is not false : Inital config failed with nonwriteable datab
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestDeleteDatabase</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c6', 1)">Detail</a>
+            <a onclick="showClassDetail('c5', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft6.1" class="none bg-danger">
+        <tr id='pt5.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestDeleteDatabase - test_delete_books_in_database</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_delete_database.py&#34;, line 70, in test_delete_books_in_database
-    self.assertEqual(0, len(list_element))
-AssertionError: 0 != 1</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -973,13 +437,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 15)">Detail</a>
+            <a onclick="showClassDetail('c6', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
@@ -988,7 +452,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.2' class='hiddenRow bg-success'>
+        <tr id='pt6.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_deactivate</div>
             </td>
@@ -997,7 +461,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.3' class='hiddenRow bg-success'>
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
@@ -1006,7 +470,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.4' class='hiddenRow bg-success'>
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
@@ -1015,7 +479,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.5' class='hiddenRow bg-success'>
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
@@ -1024,7 +488,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.6' class='hiddenRow bg-success'>
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
@@ -1033,7 +497,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.7' class='hiddenRow bg-success'>
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
@@ -1042,7 +506,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.8' class='hiddenRow bg-success'>
+        <tr id='pt6.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
@@ -1051,7 +515,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.9' class='hiddenRow bg-success'>
+        <tr id='pt6.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
@@ -1060,7 +524,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.10' class='hiddenRow bg-success'>
+        <tr id='pt6.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
@@ -1069,7 +533,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.11' class='hiddenRow bg-success'>
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
@@ -1078,7 +542,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.12' class='hiddenRow bg-success'>
+        <tr id='pt6.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_kindle_send_not_configured</div>
             </td>
@@ -1087,7 +551,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.13' class='hiddenRow bg-success'>
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
@@ -1096,7 +560,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.14' class='hiddenRow bg-success'>
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
@@ -1105,7 +569,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt7.15' class='hiddenRow bg-success'>
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
@@ -1123,13 +587,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c8', 6)">Detail</a>
+            <a onclick="showClassDetail('c7', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt8.1' class='hiddenRow bg-success'>
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
@@ -1138,7 +602,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.2' class='hiddenRow bg-success'>
+        <tr id='pt7.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
             </td>
@@ -1147,7 +611,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.3' class='hiddenRow bg-success'>
+        <tr id='pt7.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
             </td>
@@ -1156,7 +620,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.4' class='hiddenRow bg-success'>
+        <tr id='pt7.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
             </td>
@@ -1165,7 +629,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.5' class='hiddenRow bg-success'>
+        <tr id='pt7.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
             </td>
@@ -1174,7 +638,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt8.6' class='hiddenRow bg-success'>
+        <tr id='pt7.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
             </td>
@@ -1192,13 +656,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c9', 3)">Detail</a>
+            <a onclick="showClassDetail('c8', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt9.1' class='hiddenRow bg-success'>
+        <tr id='pt8.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_deactivate</div>
             </td>
@@ -1207,7 +671,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt9.2' class='hiddenRow bg-success'>
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
@@ -1216,7 +680,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt9.3' class='hiddenRow bg-success'>
+        <tr id='pt8.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -1234,13 +698,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 3)">Detail</a>
+            <a onclick="showClassDetail('c9', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt10.1' class='hiddenRow bg-success'>
+        <tr id='pt9.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_deactivate</div>
             </td>
@@ -1249,7 +713,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt10.2' class='hiddenRow bg-success'>
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
@@ -1258,7 +722,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt10.3' class='hiddenRow bg-success'>
+        <tr id='pt9.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_wrong_excecutable</div>
             </td>
@@ -1276,13 +740,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 17)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt10.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_cbz_comicinfo</div>
             </td>
@@ -1291,7 +755,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt10.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_change_upload_formats</div>
             </td>
@@ -1300,7 +764,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt10.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_book</div>
             </td>
@@ -1309,7 +773,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt10.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_delete_role</div>
             </td>
@@ -1318,7 +782,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt10.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_details_popup</div>
             </td>
@@ -1327,7 +791,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
@@ -1336,7 +800,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt10.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_capital</div>
             </td>
@@ -1345,7 +809,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
@@ -1354,7 +818,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt10.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_special_book_identifier</div>
             </td>
@@ -1363,7 +827,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt10.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_title_sort</div>
             </td>
@@ -1372,7 +836,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt10.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1381,7 +845,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt10.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_edit_role</div>
             </td>
@@ -1390,7 +854,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
@@ -1399,7 +863,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
@@ -1408,7 +872,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='st11.15' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -1417,7 +881,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
@@ -1426,7 +890,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
@@ -1444,13 +908,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 36)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1459,7 +923,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1468,7 +932,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1477,7 +941,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1486,7 +950,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1495,7 +959,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1504,7 +968,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1513,7 +977,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1522,7 +986,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1531,7 +995,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1540,7 +1004,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1549,7 +1013,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1558,7 +1022,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1567,7 +1031,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1576,7 +1040,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1585,7 +1049,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1594,7 +1058,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1603,7 +1067,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1612,7 +1076,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.19' class='hiddenRow bg-success'>
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1621,19 +1085,19 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id="st12.20" class="none bg-warning">
+        <tr id="st11.20" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st11.20" 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_st12.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1647,7 +1111,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.21' class='hiddenRow bg-success'>
+        <tr id='pt11.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1656,7 +1120,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.22' class='hiddenRow bg-success'>
+        <tr id='pt11.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1665,7 +1129,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.23' class='hiddenRow bg-success'>
+        <tr id='pt11.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1674,7 +1138,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.24' class='hiddenRow bg-success'>
+        <tr id='pt11.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1683,7 +1147,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.25' class='hiddenRow bg-success'>
+        <tr id='pt11.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1692,7 +1156,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.26' class='hiddenRow bg-success'>
+        <tr id='pt11.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1701,7 +1165,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.27' class='hiddenRow bg-success'>
+        <tr id='pt11.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1710,7 +1174,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.28' class='hiddenRow bg-success'>
+        <tr id='pt11.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1719,7 +1183,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.29' class='hiddenRow bg-success'>
+        <tr id='pt11.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1728,7 +1192,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.30' class='hiddenRow bg-success'>
+        <tr id='pt11.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1737,7 +1201,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.31' class='hiddenRow bg-success'>
+        <tr id='pt11.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1746,7 +1210,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.32' class='hiddenRow bg-success'>
+        <tr id='pt11.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1755,7 +1219,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.33' class='hiddenRow bg-success'>
+        <tr id='pt11.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1764,7 +1228,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.34' class='hiddenRow bg-success'>
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1773,7 +1237,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.35' class='hiddenRow bg-success'>
+        <tr id='pt11.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1782,7 +1246,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt12.36' class='hiddenRow bg-success'>
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1800,13 +1264,13 @@ AssertionError: 0 != 1</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c13', 6)">Detail</a>
+            <a onclick="showClassDetail('c12', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt13.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
             </td>
@@ -1815,7 +1279,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
             </td>
@@ -1824,7 +1288,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
             </td>
@@ -1833,7 +1297,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
             </td>
@@ -1842,7 +1306,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1851,7 +1315,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt13.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
             </td>
@@ -1869,13 +1333,13 @@ AssertionError: 0 != 1</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('c13', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
@@ -1884,7 +1348,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
@@ -1893,7 +1357,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
             </td>
@@ -1902,7 +1366,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
@@ -1911,7 +1375,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt13.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1920,7 +1384,7 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
@@ -1933,18 +1397,18 @@ AssertionError: 0 != 1</pre>
     <tr id="su" class="failClass">
         <td>TestEditBooksList</td>
         <td class="text-center">18</td>
-        <td class="text-center">14</td>
-        <td class="text-center">4</td>
+        <td class="text-center">15</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 18)">Detail</a>
+            <a onclick="showClassDetail('c14', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1953,19 +1417,19 @@ AssertionError: 0 != 1</pre>
     
     
     
-        <tr id="ft15.2" class="none bg-danger">
+        <tr id="ft14.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.2')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.2')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.2" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.2" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.2').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1982,7 +1446,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1991,7 +1455,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -2000,7 +1464,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -2009,7 +1473,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -2018,7 +1482,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -2027,7 +1491,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -2036,7 +1500,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -2045,7 +1509,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -2054,55 +1518,37 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id="ft15.11" class="none bg-danger">
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft15.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 231, in test_bookslist_edit_languages
-    self.assertEqual(4, len(elements))
-AssertionError: 4 != 5</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft15.12" class="none bg-danger">
+        <tr id="ft14.12" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.12')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.12')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.12" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.12" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.12').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 205, in test_bookslist_edit_publisher
-    self.assertEqual(2, len(elements))
-AssertionError: 2 != 3</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_list.py&#34;, line 206, in test_bookslist_edit_publisher
+    self.assertEqual(&#34;Pandöm,Ti|s@d&#34;, elements[0].text)
+AssertionError: &#39;Pandöm,Ti|s@d&#39; != &#39;None&#39;
+- Pandöm,Ti|s@d
++ None</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2112,7 +1558,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -2121,7 +1567,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -2130,7 +1576,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -2139,7 +1585,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -2148,7 +1594,7 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -2157,19 +1603,19 @@ AssertionError: 2 != 3</pre>
     
     
     
-        <tr id="ft15.18" class="none bg-danger">
+        <tr id="ft14.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft15.18')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.18')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft15.18" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.18" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft15.18').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.18').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2189,45 +1635,25 @@ AssertionError: 4 != 5</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadata</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et16.1" class="none bg-info">
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et16.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et16.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_metadata.py&#34;, line 63, in test_load_metadata
-    if &#39;https://comicvine.gamespot.com/&#39; == results[10][&#39;source&#39;]:
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2241,13 +1667,13 @@ IndexError: list index out of range</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 18)">Detail</a>
+            <a onclick="showClassDetail('c16', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -2256,7 +1682,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -2265,7 +1691,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -2274,7 +1700,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -2283,7 +1709,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -2292,7 +1718,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -2301,7 +1727,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -2310,7 +1736,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -2319,7 +1745,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -2328,7 +1754,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.10' class='hiddenRow bg-success'>
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -2337,7 +1763,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.11' class='hiddenRow bg-success'>
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -2346,7 +1772,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.12' class='hiddenRow bg-success'>
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2355,7 +1781,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.13' class='hiddenRow bg-success'>
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2364,7 +1790,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.14' class='hiddenRow bg-success'>
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2373,7 +1799,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.15' class='hiddenRow bg-success'>
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2382,7 +1808,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.16' class='hiddenRow bg-success'>
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2391,7 +1817,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.17' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -2400,7 +1826,7 @@ IndexError: list index out of range</pre>
     
     
     
-        <tr id='pt17.18' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2410,45 +1836,25 @@ IndexError: list index out of range</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestLoadMetadataScholar</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft18.1" class="none bg-danger">
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_metadata_scholar.py&#34;, line 68, in test_load_metadata
-    self.assertEqual(30, len(results))
-AssertionError: 30 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -2462,13 +1868,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -2477,7 +1883,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -2486,7 +1892,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2504,13 +1910,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2519,7 +1925,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2528,7 +1934,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2537,7 +1943,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2546,7 +1952,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2555,7 +1961,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2564,7 +1970,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2582,13 +1988,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2606,13 +2012,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 2)">Detail</a>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2621,7 +2027,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2639,13 +2045,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2654,19 +2060,19 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.2" 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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2680,7 +2086,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2698,13 +2104,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2722,13 +2128,13 @@ AssertionError: 30 != 0</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2737,7 +2143,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2746,7 +2152,7 @@ AssertionError: 30 != 0</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2756,52 +2162,30 @@ AssertionError: 30 != 0</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">10</td>
-        <td class="text-center">1</td>
+        <td class="text-center">11</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('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft26.1" class="none bg-danger">
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft26.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft26.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 581, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 168, in inital_sync
-    self.assertEqual(r.status_code, 200)
-AssertionError: 404 != 200</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2810,7 +2194,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2819,7 +2203,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2828,7 +2212,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2837,7 +2221,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2846,7 +2230,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2855,7 +2239,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2864,7 +2248,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2873,7 +2257,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2882,7 +2266,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2900,13 +2284,13 @@ AssertionError: 404 != 200</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 5)">Detail</a>
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
@@ -2915,7 +2299,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2924,7 +2308,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2933,7 +2317,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2942,7 +2326,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2960,13 +2344,13 @@ AssertionError: 404 != 200</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2975,7 +2359,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2984,7 +2368,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2993,7 +2377,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -3002,7 +2386,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -3011,7 +2395,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -3020,7 +2404,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3029,7 +2413,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3038,7 +2422,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3047,7 +2431,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3056,7 +2440,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -3065,7 +2449,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -3074,7 +2458,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -3084,21 +2468,21 @@ AssertionError: 404 != 200</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebListOrders</td>
         <td class="text-center">10</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
-        <td class="text-center">1</td>
+        <td class="text-center">10</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('c29', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3107,7 +2491,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3116,7 +2500,7 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -3125,36 +2509,16 @@ AssertionError: 404 != 200</pre>
     
     
     
-        <tr id="ft29.4" class="none bg-danger">
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 194, in test_lang_sort
-    self.assertEqual(len(list_element), 3)
-AssertionError: 4 != 3</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -3163,7 +2527,7 @@ AssertionError: 4 != 3</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -3172,120 +2536,38 @@ AssertionError: 4 != 3</pre>
     
     
     
-        <tr id="ft29.7" class="none bg-danger">
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 161, in test_publisher_sort
-    self.assertEqual(list_element[0][&#39;title&#39;], &#34;Randomhäus&#34;)
-AssertionError: &#39;None&#39; != &#39;Randomhäus&#39;
-- None
-+ Randomhäus</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et29.8" class="none bg-info">
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et29.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et29.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et29.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 239, in test_ratings_sort
-    self.assertEqual(list_element[0][&#39;title&#39;], &#34;2&#34;)
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft29.9" class="none bg-danger">
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 39, in test_series_sort
-    self.assertTrue(list)
-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>
     
     
     
-        <tr id="ft29.10" class="none bg-danger">
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft29.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft29.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft29.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_list_orders.py&#34;, line 222, in test_tags_sort
-    self.assertEqual(len(list_element), 2)
-AssertionError: 3 != 2</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3299,13 +2581,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -3314,7 +2596,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3323,7 +2605,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3332,7 +2614,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3341,19 +2623,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3367,7 +2649,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3376,7 +2658,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3385,7 +2667,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3394,7 +2676,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3412,13 +2694,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3427,7 +2709,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3436,7 +2718,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3445,7 +2727,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3454,7 +2736,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3463,7 +2745,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3472,7 +2754,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3481,7 +2763,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3490,7 +2772,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3499,7 +2781,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3508,7 +2790,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3517,7 +2799,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3526,7 +2808,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3535,7 +2817,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3544,7 +2826,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3562,13 +2844,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3577,7 +2859,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3595,13 +2877,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3610,7 +2892,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3628,13 +2910,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3643,7 +2925,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3652,7 +2934,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3661,7 +2943,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3670,7 +2952,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3679,7 +2961,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3688,7 +2970,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3697,7 +2979,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3706,7 +2988,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3715,7 +2997,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3724,7 +3006,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3733,7 +3015,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3742,7 +3024,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3751,7 +3033,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3760,7 +3042,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3769,7 +3051,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3778,7 +3060,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3787,7 +3069,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3796,7 +3078,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3805,7 +3087,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3814,7 +3096,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3823,7 +3105,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3832,7 +3114,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3850,13 +3132,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3874,13 +3156,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 3)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
@@ -3889,7 +3171,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt36.2' class='hiddenRow bg-success'>
+        <tr id='pt35.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
@@ -3898,7 +3180,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt36.3' class='hiddenRow bg-success'>
+        <tr id='pt35.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestPipInstall - test_module_start</div>
             </td>
@@ -3916,13 +3198,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -3931,7 +3213,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -3940,7 +3222,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -3949,7 +3231,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -3958,7 +3240,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3976,13 +3258,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -4000,13 +3282,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -4024,13 +3306,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -4039,7 +3321,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -4048,7 +3330,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -4057,7 +3339,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -4066,7 +3348,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -4075,7 +3357,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -4084,7 +3366,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -4093,7 +3375,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -4111,13 +3393,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -4126,7 +3408,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -4135,7 +3417,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -4153,13 +3435,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -4168,7 +3450,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -4177,7 +3459,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -4186,7 +3468,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -4195,7 +3477,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -4204,7 +3486,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -4213,7 +3495,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -4222,7 +3504,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -4231,7 +3513,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -4240,7 +3522,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -4249,7 +3531,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -4258,7 +3540,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -4267,7 +3549,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -4276,19 +3558,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st42.14" class="none bg-warning">
+        <tr id="st41.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.14" 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_st42.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4302,7 +3584,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -4311,7 +3593,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -4329,13 +3611,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 9)">Detail</a>
+            <a onclick="showClassDetail('c42', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -4344,7 +3626,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -4353,7 +3635,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -4362,7 +3644,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -4371,7 +3653,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -4380,7 +3662,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -4389,19 +3671,19 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="st43.7" class="none bg-warning">
+        <tr id="st42.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st43.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st43.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.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_st43.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4415,7 +3697,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -4424,7 +3706,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt43.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
@@ -4442,13 +3724,13 @@ AssertionError: 3 != 2</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 4)">Detail</a>
+            <a onclick="showClassDetail('c43', 4)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
@@ -4457,7 +3739,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
             </td>
@@ -4466,7 +3748,7 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4475,28 +3757,28 @@ AssertionError: 3 != 2</pre>
     
     
     
-        <tr id="ft44.4" class="none bg-danger">
+        <tr id="ft43.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.4')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
+                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.4').style.display='none'"><span
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 92, in test_upload_epub_lang
-    self.assertEqual(&#39;Tedesco&#39;, list_element[2].text)
-AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
-- Tedesco
-+ Norvegese bokmål</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 94, in test_upload_epub_lang
+    self.assertEqual(&#34;Lingua: Tedesco&#34;, self.driver.find_elements(By.TAG_NAME, &#34;h2&#34;)[1].text)
+AssertionError: &#39;Lingua: Tedesco&#39; != &#39;Lingua: Norvegese bokmål&#39;
+- Lingua: Tedesco
++ Lingua: Norvegese bokmål</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4515,13 +3797,13 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c45', 18)">Detail</a>
+            <a onclick="showClassDetail('c44', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4530,7 +3812,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4539,7 +3821,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4548,7 +3830,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4557,7 +3839,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4566,7 +3848,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4575,7 +3857,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt44.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4584,7 +3866,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4593,7 +3875,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4602,7 +3884,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt44.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4611,7 +3893,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt44.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4620,7 +3902,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt44.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4629,7 +3911,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt44.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4638,7 +3920,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt44.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4647,7 +3929,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt44.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4656,7 +3938,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt44.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4665,7 +3947,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt44.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4674,7 +3956,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt44.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4692,13 +3974,13 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 1)">Detail</a>
+            <a onclick="showClassDetail('c45', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4716,13 +3998,13 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c47', 21)">Detail</a>
+            <a onclick="showClassDetail('c46', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt47.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4731,7 +4013,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4740,7 +4022,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4749,7 +4031,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4758,7 +4040,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4767,7 +4049,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4776,7 +4058,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4785,7 +4067,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4794,7 +4076,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4803,7 +4085,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4812,7 +4094,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4821,7 +4103,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4830,7 +4112,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4839,7 +4121,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4848,7 +4130,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4857,7 +4139,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4866,7 +4148,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4875,7 +4157,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4884,7 +4166,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.19' class='hiddenRow bg-success'>
+        <tr id='pt46.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4893,7 +4175,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.20' class='hiddenRow bg-success'>
+        <tr id='pt46.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4902,7 +4184,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt47.21' class='hiddenRow bg-success'>
+        <tr id='pt46.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4912,21 +4194,21 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
         <td class="text-center">35</td>
-        <td class="text-center">30</td>
-        <td class="text-center">1</td>
-        <td class="text-center">4</td>
+        <td class="text-center">35</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('c48', 35)">Detail</a>
+            <a onclick="showClassDetail('c47', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt48.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4935,7 +4217,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.2' class='hiddenRow bg-success'>
+        <tr id='pt47.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4944,7 +4226,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.3' class='hiddenRow bg-success'>
+        <tr id='pt47.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4953,7 +4235,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.4' class='hiddenRow bg-success'>
+        <tr id='pt47.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4962,7 +4244,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.5' class='hiddenRow bg-success'>
+        <tr id='pt47.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4971,7 +4253,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.6' class='hiddenRow bg-success'>
+        <tr id='pt47.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4980,7 +4262,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.7' class='hiddenRow bg-success'>
+        <tr id='pt47.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4989,7 +4271,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.8' class='hiddenRow bg-success'>
+        <tr id='pt47.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4998,7 +4280,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.9' class='hiddenRow bg-success'>
+        <tr id='pt47.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -5007,7 +4289,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.10' class='hiddenRow bg-success'>
+        <tr id='pt47.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -5016,7 +4298,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.11' class='hiddenRow bg-success'>
+        <tr id='pt47.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -5025,7 +4307,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.12' class='hiddenRow bg-success'>
+        <tr id='pt47.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -5034,7 +4316,7 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id='pt48.13' class='hiddenRow bg-success'>
+        <tr id='pt47.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -5043,186 +4325,52 @@ AssertionError: &#39;Tedesco&#39; != &#39;Norvegese bokmål&#39;
     
     
     
-        <tr id="et48.14" class="none bg-info">
+        <tr id='pt47.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 349, in test_admin_change_visibility_rating
-    self.verify_order(&#34;nav_rate&#34;, 0, order=order)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1332, in verify_order
-    list_elements[index][&#39;ele&#39;].click()
-IndexError: list index out of range</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et48.15" class="none bg-info">
+        <tr id='pt47.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.15')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 196, in test_admin_change_visibility_read
-    self.change_user({&#39;show_256&#39;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_256&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et48.16" class="none bg-info">
+        <tr id='pt47.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 290, in test_admin_change_visibility_series
-    self.change_user({&#39;show_4&#39;: 0})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1030, in change_user
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;show_4&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et48.17" class="none bg-info">
+        <tr id='pt47.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et48.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et48.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 733, in test_allow_columns
-    self.fill_view_config({&#39;config_restricted_column&#39;: &#34;Custom Text 人物 *&#39;()&amp;&#34;})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 363, in fill_view_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.CLASS_NAME, &#34;discover&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft48.18" class="none bg-danger">
+        <tr id='pt47.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft48.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft48.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft48.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_visiblilitys.py&#34;, line 596, in test_allow_tags
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-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>
     
     
     
-        <tr id='pt48.19' class='hiddenRow bg-success'>
+        <tr id='pt47.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -5231,7 +4379,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.20' class='hiddenRow bg-success'>
+        <tr id='pt47.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -5240,7 +4388,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.21' class='hiddenRow bg-success'>
+        <tr id='pt47.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -5249,7 +4397,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.22' class='hiddenRow bg-success'>
+        <tr id='pt47.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -5258,7 +4406,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.23' class='hiddenRow bg-success'>
+        <tr id='pt47.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -5267,7 +4415,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.24' class='hiddenRow bg-success'>
+        <tr id='pt47.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -5276,7 +4424,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.25' class='hiddenRow bg-success'>
+        <tr id='pt47.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -5285,7 +4433,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.26' class='hiddenRow bg-success'>
+        <tr id='pt47.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
             </td>
@@ -5294,7 +4442,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.27' class='hiddenRow bg-success'>
+        <tr id='pt47.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -5303,7 +4451,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.28' class='hiddenRow bg-success'>
+        <tr id='pt47.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -5312,7 +4460,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.29' class='hiddenRow bg-success'>
+        <tr id='pt47.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -5321,7 +4469,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.30' class='hiddenRow bg-success'>
+        <tr id='pt47.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -5330,7 +4478,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.31' class='hiddenRow bg-success'>
+        <tr id='pt47.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -5339,7 +4487,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.32' class='hiddenRow bg-success'>
+        <tr id='pt47.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -5348,7 +4496,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.33' class='hiddenRow bg-success'>
+        <tr id='pt47.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -5357,7 +4505,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.34' class='hiddenRow bg-success'>
+        <tr id='pt47.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -5366,7 +4514,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt48.35' class='hiddenRow bg-success'>
+        <tr id='pt47.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -5384,13 +4532,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c49', 16)">Detail</a>
+            <a onclick="showClassDetail('c48', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt49.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -5399,7 +4547,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -5408,7 +4556,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -5417,7 +4565,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -5426,7 +4574,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -5435,7 +4583,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -5444,7 +4592,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -5453,7 +4601,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -5462,7 +4610,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -5471,7 +4619,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -5480,7 +4628,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -5489,7 +4637,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -5498,7 +4646,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -5507,7 +4655,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -5516,7 +4664,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -5525,7 +4673,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt49.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -5536,10 +4684,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>416</td>
-        <td>372</td>
-        <td>23</td>
-        <td>15</td>
+        <td>410</td>
+        <td>400</td>
+        <td>4</td>
+        <td>0</td>
         <td>6</td>
         <td>&nbsp;</td>
     </tr>
@@ -5616,7 +4764,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-Login</th>
-              <td>0.5.0</td>
+              <td>0.6.0</td>
               <td>Basic</td>
             </tr>
           
@@ -5712,7 +4860,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5730,7 +4878,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5742,7 +4890,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5760,7 +4908,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5772,7 +4920,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5790,7 +4938,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5814,7 +4962,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5832,7 +4980,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5850,7 +4998,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5868,7 +5016,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5892,7 +5040,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.44.0</td>
+              <td>2.45.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5910,7 +5058,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5982,7 +5130,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(372, 23, 15, 6);
+    drawCircle(400, 4, 0, 6);
     showCase(5);
 </script>
 

From 5c342d4e7c8f7bfb8740599d69b7607c69a2b09c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 22 Apr 2022 09:06:37 +0200
Subject: [PATCH 197/220] use get for dicts

---
 cps/web.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/cps/web.py b/cps/web.py
index 517539f8..8d8b9043 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1568,13 +1568,13 @@ def register():
 
     if request.method == "POST":
         to_save = request.form.to_dict()
-        nickname = to_save["email"].strip() if config.config_register_email else to_save.get('name')
+        nickname = to_save.get("email", "").strip() if config.config_register_email else to_save.get('name')
         if not nickname or not to_save.get("email"):
             flash(_(u"Please fill out all fields!"), category="error")
             return render_title_template('register.html', title=_("Register"), page="register")
         try:
             nickname = check_username(nickname)
-            email = check_email(to_save["email"])
+            email = check_email(to_save.get("email", ""))
         except Exception as ex:
             flash(str(ex), category="error")
             return render_title_template('register.html', title=_("Register"), page="register")
@@ -1592,14 +1592,15 @@ def register():
                 ub.session.commit()
                 if feature_support['oauth']:
                     register_user_with_oauth(content)
-                send_registration_mail(to_save["email"].strip(), nickname, password)
+                send_registration_mail(to_save.get("email", "").strip(), nickname, password)
             except Exception:
                 ub.session.rollback()
                 flash(_(u"An unknown error occurred. Please try again later."), category="error")
                 return render_title_template('register.html', title=_("Register"), page="register")
         else:
             flash(_(u"Your e-mail is not allowed to register"), category="error")
-            log.warning('Registering failed for user "%s" e-mail address: %s', nickname, to_save["email"])
+            log.warning('Registering failed for user "{}" e-mail address: {}'.format(nickname,
+                                                                                     to_save.get("email","")))
             return render_title_template('register.html', title=_("Register"), page="register")
         flash(_(u"Confirmation e-mail was send to your e-mail account."), category="success")
         return redirect(url_for('web.login'))
@@ -1625,7 +1626,7 @@ def login():
             if login_result:
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
-                log.debug(u"You are now logged in as: '%s'", user.name)
+                log.debug(u"You are now logged in as: '{}'".format(user.name))
                 flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.name),
                       category="success")
                 return redirect_back(url_for("web.index"))
@@ -1633,7 +1634,7 @@ def login():
                     and user.name != "Guest":
                 login_user(user, remember=bool(form.get('remember_me')))
                 ub.store_user_session()
-                log.info("Local Fallback Login as: '%s'", user.name)
+                log.info("Local Fallback Login as: '{}'".format(user.name))
                 flash(_(u"Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known",
                         nickname=user.name),
                       category="warning")
@@ -1647,7 +1648,7 @@ def login():
                 flash(_(u"Wrong Username or Password"), category="error")
         else:
             ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
-            if 'forgot' in form and form['forgot'] == 'forgot':
+            if form.get('forgot', "") == 'forgot':
                 if user is not None and user.name != "Guest":
                     ret, __ = reset_password(user.id)
                     if ret == 1:
@@ -1700,21 +1701,19 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
     current_user.random_books = 0
     if current_user.role_passwd() or current_user.role_admin():
         if to_save.get("password"):
-            current_user.password = generate_password_hash(to_save["password"])
+            current_user.password = generate_password_hash(to_save.get("password"))
     try:
         if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail:
-            current_user.kindle_mail = valid_email(to_save["kindle_mail"])
+            current_user.kindle_mail = valid_email(to_save.get("kindle_mail"))
         if to_save.get("email", current_user.email) != current_user.email:
-            current_user.email = check_email(to_save["email"])
+            current_user.email = check_email(to_save.get("email"))
         if current_user.role_admin():
             if to_save.get("name", current_user.name) != current_user.name:
                 # Query username, if not existing, change
-                current_user.name = check_username(to_save["name"])
+                current_user.name = check_username(to_save.get("name"))
         current_user.random_books = 1 if to_save.get("show_random") == "on" else 0
-        if to_save.get("default_language"):
-            current_user.default_language = to_save["default_language"]
-        if to_save.get("locale"):
-            current_user.locale = to_save["locale"]
+        current_user.default_language = to_save.get("default_language", "all")
+        current_user.locale = to_save.get("locale", "en")
         old_state = current_user.kobo_only_shelves_sync
         # 1 -> 0: nothing has to be done
         # 0 -> 1: all synced books have to be added to archived books, + currently synced shelfs which

From 9a8093db310e68866338e015975a0abdfb1d95e7 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 22 Apr 2022 16:13:51 +0200
Subject: [PATCH 198/220] Thumbnail is generated directly after a book is added

---
 cps/__init__.py        |  6 -----
 cps/db.py              |  5 ++++-
 cps/editbooks.py       |  1 +
 cps/helper.py          | 12 +++++++---
 cps/kobo.py            |  8 +++----
 cps/tasks/thumbnail.py | 50 ++++++++++++++++++++++++++----------------
 6 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index f6df9636..68947905 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -179,12 +179,6 @@ def get_locale():
     return negotiate_locale(preferred or ['en'], _BABEL_TRANSLATIONS)
 
 
-@babel.timezoneselector
-def get_timezone():
-    user = getattr(g, 'user', None)
-    return user.timezone if user else None
-
-
 from .updater import Updater
 updater_thread = Updater()
 
diff --git a/cps/db.py b/cps/db.py
index 68e02b81..3dd2907d 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -940,7 +940,10 @@ class CalibreDB:
             return title.strip()
 
         conn = conn or self.session.connection().connection.connection
-        conn.create_function("title_sort", 1, _title_sort)
+        try:
+            conn.create_function("title_sort", 1, _title_sort)
+        except OperationalError:
+            pass
 
     @classmethod
     def dispose(cls):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 8e815fd4..1d61c8dd 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -1132,6 +1132,7 @@ def upload():
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
                 upload_text = _(u"File %(file)s uploaded", file=link)
                 WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
+                helper.add_book_to_thumbnail_cache(book_id)
 
                 if len(request.files.getlist("btn-upload")) < 2:
                     if current_user.role_edit() or current_user.role_admin():
diff --git a/cps/helper.py b/cps/helper.py
index 9d8a1d3b..77317343 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -60,7 +60,7 @@ from .subproc_wrapper import process_wait
 from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
     STAT_CANCELLED
 from .tasks.mail import TaskEmail
-from .tasks.thumbnail import TaskClearCoverThumbnailCache
+from .tasks.thumbnail import TaskClearCoverThumbnailCache, TaskGenerateCoverThumbnails
 
 log = logger.create()
 
@@ -715,9 +715,10 @@ def get_book_cover(book_id, resolution=None):
     return get_book_cover_internal(book, use_generic_cover_on_failure=True, resolution=resolution)
 
 
-def get_book_cover_with_uuid(book_uuid, use_generic_cover_on_failure=True):
+# Called only by kobo sync -> cover not found should be answered with 404 and not with default cover
+def get_book_cover_with_uuid(book_uuid, resolution=None):
     book = calibre_db.get_book_by_uuid(book_uuid)
-    return get_book_cover_internal(book, use_generic_cover_on_failure)
+    return get_book_cover_internal(book, use_generic_cover_on_failure=False, resolution=resolution)
 
 
 def get_book_cover_internal(book, use_generic_cover_on_failure, resolution=None):
@@ -1079,5 +1080,10 @@ def get_download_link(book_id, book_format, client):
 def clear_cover_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
 
+
 def delete_thumbnail_cache():
     WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
+
+
+def add_book_to_thumbnail_cache(book_id):
+    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id))
diff --git a/cps/kobo.py b/cps/kobo.py
index d02660b2..f2a3b2f8 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -45,7 +45,7 @@ import requests
 
 
 from . import config, logger, kobo_auth, db, calibre_db, helper, shelf as shelf_lib, ub, csrf, kobo_sync_status
-from .constants import sqlalchemy_version2
+from .constants import sqlalchemy_version2, COVER_THUMBNAIL_SMALL
 from .helper import get_download_link
 from .services import SyncToken as SyncToken
 from .web import download_required
@@ -915,10 +915,8 @@ def get_current_bookmark_response(current_bookmark):
 @kobo.route("/<book_uuid>/<width>/<height>/<isGreyscale>/image.jpg", defaults={'Quality': ""})
 @kobo.route("/<book_uuid>/<width>/<height>/<Quality>/<isGreyscale>/image.jpg")
 @requires_kobo_auth
-def HandleCoverImageRequest(book_uuid, width, height,Quality, isGreyscale):
-    book_cover = helper.get_book_cover_with_uuid(
-        book_uuid, use_generic_cover_on_failure=False
-    )
+def HandleCoverImageRequest(book_uuid, width, height, Quality, isGreyscale):
+    book_cover = helper.get_book_cover_with_uuid(book_uuid, resolution=COVER_THUMBNAIL_SMALL)
     if not book_cover:
         if config.config_kobo_proxy:
             log.debug("Cover for unknown book: %s proxied to kobo" % book_uuid)
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 3601ff93..0d824e7c 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -64,9 +64,10 @@ def get_best_fit(width, height, image_width, image_height):
 
 
 class TaskGenerateCoverThumbnails(CalibreTask):
-    def __init__(self, task_message=''):
+    def __init__(self, book_id=-1, task_message=''):
         super(TaskGenerateCoverThumbnails, self).__init__(task_message)
         self.log = logger.create()
+        self.book_id = book_id
         self.app_db_session = ub.get_new_session_instance()
         self.calibre_db = db.CalibreDB(expire_on_commit=False)
         self.cache = fs.FileSystem()
@@ -77,31 +78,20 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+            if self.book_id < 0:
+                self.create_book_cover_thumbnails(self.book_id)
+                self._handleSuccess()
+                self.app_db_session.remove()
+                return
             self.message = 'Scanning Books'
             books_with_covers = self.get_books_with_covers()
             count = len(books_with_covers)
 
             total_generated = 0
             for i, book in enumerate(books_with_covers):
-                generated = 0
-                book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
 
                 # Generate new thumbnails for missing covers
-                resolutions = list(map(lambda t: t.resolution, book_cover_thumbnails))
-                missing_resolutions = list(set(self.resolutions).difference(resolutions))
-                for resolution in missing_resolutions:
-                    generated += 1
-                    self.create_book_cover_thumbnail(book, resolution)
-
-                # Replace outdated or missing thumbnails
-                for thumbnail in book_cover_thumbnails:
-                    if book.last_modified > thumbnail.generated_at:
-                        generated += 1
-                        self.update_book_cover_thumbnail(book, thumbnail)
-
-                    elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
-                        generated += 1
-                        self.update_book_cover_thumbnail(book, thumbnail)
+                generated = self.create_book_cover_thumbnails(book)
 
                 # Increment the progress
                 self.progress = (1.0 / count) * i
@@ -139,7 +129,29 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             .filter(or_(ub.Thumbnail.expiration.is_(None), ub.Thumbnail.expiration > datetime.utcnow())) \
             .all()
 
-    def create_book_cover_thumbnail(self, book, resolution):
+    def create_book_cover_thumbnails(self, book):
+        generated = 0
+        book_cover_thumbnails = self.get_book_cover_thumbnails(book.id)
+
+        # Generate new thumbnails for missing covers
+        resolutions = list(map(lambda t: t.resolution, book_cover_thumbnails))
+        missing_resolutions = list(set(self.resolutions).difference(resolutions))
+        for resolution in missing_resolutions:
+            generated += 1
+            self.create_book_cover_single_thumbnail(book, resolution)
+
+        # Replace outdated or missing thumbnails
+        for thumbnail in book_cover_thumbnails:
+            if book.last_modified > thumbnail.generated_at:
+                generated += 1
+                self.update_book_cover_thumbnail(book, thumbnail)
+
+            elif not self.cache.get_cache_file_exists(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS):
+                generated += 1
+                self.update_book_cover_thumbnail(book, thumbnail)
+        return generated
+
+    def create_book_cover_single_thumbnail(self, book, resolution):
         thumbnail = ub.Thumbnail()
         thumbnail.type = constants.THUMBNAIL_TYPE_COVER
         thumbnail.entity_id = book.id

From 2f5b9e41acc4aef7cb35eaa1235dceb98c3afb0b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 22 Apr 2022 20:31:03 +0200
Subject: [PATCH 199/220] Reduce number visible System tasks in Tasks list

---
 cps/helper.py          |  7 ++++---
 cps/services/worker.py | 25 +++++++++----------------
 cps/tasks/thumbnail.py | 25 +++++++++++++------------
 3 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 77317343..43b7141d 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -991,7 +991,7 @@ def format_runtime(runtime):
 # helper function to apply localize status information in tasklist entries
 def render_task_status(tasklist):
     renderedtasklist = list()
-    for __, user, __, task in tasklist:
+    for __, user, __, task, __ in tasklist:
         if user == current_user.name or current_user.role_admin():
             ret = {}
             if task.start_time:
@@ -1078,7 +1078,8 @@ def get_download_link(book_id, book_format, client):
 
 
 def clear_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id))
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id, _("Replace Thumbnail for book {}".format(book_id))),
+                     hidden=True)
 
 
 def delete_thumbnail_cache():
@@ -1086,4 +1087,4 @@ def delete_thumbnail_cache():
 
 
 def add_book_to_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id))
+    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
diff --git a/cps/services/worker.py b/cps/services/worker.py
index 68e24312..c1a8c384 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -43,7 +43,7 @@ STAT_CANCELLED = 5
 # Only retain this many tasks in dequeued list
 TASK_CLEANUP_TRIGGER = 20
 
-QueuedTask = namedtuple('QueuedTask', 'num, user, added, task')
+QueuedTask = namedtuple('QueuedTask', 'num, user, added, task, hidden')
 
 
 def _get_main_thread():
@@ -84,7 +84,7 @@ class WorkerThread(threading.Thread):
         self.start()
 
     @classmethod
-    def add(cls, user, task):
+    def add(cls, user, task, hidden=False):
         ins = cls.get_instance()
         ins.num += 1
         username = user if user is not None else 'System'
@@ -94,6 +94,7 @@ class WorkerThread(threading.Thread):
             user=username,
             added=datetime.now(),
             task=task,
+            hidden=hidden
         ))
 
     @property
@@ -114,10 +115,10 @@ class WorkerThread(threading.Thread):
             if delta > TASK_CLEANUP_TRIGGER:
                 ret = alive
             else:
-                # otherwise, lop off the oldest dead tasks until we hit the target trigger
-                ret = sorted(dead, key=lambda x: x.task.end_time)[-TASK_CLEANUP_TRIGGER:] + alive
+                # otherwise, loop off the oldest dead tasks until we hit the target trigger
+                ret = sorted(dead, key=lambda y: y.task.end_time)[-TASK_CLEANUP_TRIGGER:] + alive
 
-            self.dequeued = sorted(ret, key=lambda x: x.num)
+            self.dequeued = sorted(ret, key=lambda y: y.num)
 
     # Main thread loop starting the different tasks
     def run(self):
@@ -144,11 +145,11 @@ class WorkerThread(threading.Thread):
 
             # sometimes tasks (like Upload) don't actually have work to do and are created as already finished
             if item.task.stat is STAT_WAITING:
-                # CalibreTask.start() should wrap all exceptions in it's own error handling
+                # CalibreTask.start() should wrap all exceptions in its own error handling
                 item.task.start(self)
 
-            # remove self_cleanup tasks from list
-            if item.task.self_cleanup:
+            # remove self_cleanup tasks and hidden "System Tasks" from list
+            if item.task.self_cleanup or item.hidden:
                 self.dequeued.remove(item)
 
             self.queue.task_done()
@@ -241,14 +242,6 @@ class CalibreTask:
         # By default, we're good to clean a task if it's "Done"
         return self.stat in (STAT_FINISH_SUCCESS, STAT_FAIL, STAT_ENDED, STAT_CANCELLED)
 
-    '''@progress.setter
-    def progress(self, x):        
-        if x > 1: 
-            x = 1
-        if x < 0: 
-            x = 0
-        self._progress = x'''
-
     @property
     def self_cleanup(self):
         return self._self_cleanup
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 0d824e7c..c66c30ec 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -78,13 +78,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def run(self, worker_thread):
         if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
-            if self.book_id < 0:
-                self.create_book_cover_thumbnails(self.book_id)
-                self._handleSuccess()
-                self.app_db_session.remove()
-                return
             self.message = 'Scanning Books'
-            books_with_covers = self.get_books_with_covers()
+            books_with_covers = self.get_books_with_covers(self.book_id)
             count = len(books_with_covers)
 
             total_generated = 0
@@ -115,10 +110,12 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self._handleSuccess()
         self.app_db_session.remove()
 
-    def get_books_with_covers(self):
+    def get_books_with_covers(self, book_id=-1):
+        filter_exp = (db.Books.id == book_id) if book_id != -1 else True
         return self.calibre_db.session \
             .query(db.Books) \
             .filter(db.Books.has_cover == 1) \
+            .filter(filter_exp) \
             .all()
 
     def get_book_cover_thumbnails(self, book_id):
@@ -224,10 +221,13 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'GenerateCoverThumbnails'
+        return 'Cover Thumbnails'
 
     def __str__(self):
-        return "GenerateCoverThumbnails"
+        if self.book_id > 0:
+            return "Add Thumbnail for book {}".format(self.book_id)
+        else:
+            return "Generate Cover Thumbnails"
 
     @property
     def is_cancellable(self):
@@ -434,7 +434,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'GenerateSeriesThumbnails'
+        return 'Cover Thumbnails'
 
     def __str__(self):
         return "GenerateSeriesThumbnails"
@@ -496,11 +496,12 @@ class TaskClearCoverThumbnailCache(CalibreTask):
 
     @property
     def name(self):
-        return 'ThumbnailsClear'
+        return 'Cover Thumbnails'
 
+    # needed for logging
     def __str__(self):
         if self.book_id > 0:
-            return "Delete Thumbnail cache for book " + str(self.book_id)
+            return "Replace Thumbnail cache for book " + str(self.book_id)
         else:
             return "Delete Thumbnail cache directory"
 

From 069dc2766fc82fd520a729113c709fb159cf81c3 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 23 Apr 2022 19:56:02 +0200
Subject: [PATCH 200/220] Update optional-requirements Bugfix with serializing
 tasks Bugfix order of tasks (id was used instead of task_id) Code cosmetics

---
 cps/editbooks.py          | 36 +++++++++--------
 cps/helper.py             | 13 ++++---
 cps/kobo.py               | 82 ++++++++++++++++++++-------------------
 cps/schedule.py           |  2 +-
 cps/services/worker.py    |  2 +-
 cps/static/js/table.js    |  4 +-
 cps/tasks/thumbnail.py    |  6 +--
 optional-requirements.txt |  4 +-
 8 files changed, 79 insertions(+), 70 deletions(-)

diff --git a/cps/editbooks.py b/cps/editbooks.py
index 1d61c8dd..f2ad969c 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -241,7 +241,7 @@ def delete_book_ajax(book_id, book_format):
 
 
 def delete_whole_book(book_id, book):
-    # delete book from Shelfs, Downloads, Read list
+    # delete book from shelves, 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.delete_download(book_id)
@@ -383,7 +383,7 @@ def render_edit_book(book_id):
     for authr in book.authors:
         author_names.append(authr.name.replace('|', ','))
 
-    # Option for showing convertbook button
+    # Option for showing convert_book button
     valid_source_formats = list()
     allowed_conversion_formats = list()
     kepub_possible = None
@@ -413,11 +413,11 @@ def render_edit_book(book_id):
 
 def edit_book_ratings(to_save, book):
     changed = False
-    if to_save.get("rating","").strip():
+    if to_save.get("rating", "").strip():
         old_rating = False
         if len(book.ratings) > 0:
             old_rating = book.ratings[0].rating
-        rating_x2 = int(float(to_save.get("rating","")) * 2)
+        rating_x2 = int(float(to_save.get("rating", "")) * 2)
         if rating_x2 != old_rating:
             changed = True
             is_rating = calibre_db.session.query(db.Ratings).filter(db.Ratings.rating == rating_x2).first()
@@ -622,8 +622,9 @@ def edit_cc_data(book_id, book, to_save, cc):
                                               'custom')
     return changed
 
+
 # returns None if no file is uploaded
-# returns False if an error occours, in all other cases the ebook metadata is returned
+# returns False if an error occurs, in all other cases the ebook metadata is returned
 def upload_single_file(file_request, book, book_id):
     # Check and handle Uploaded file
     requested_file = file_request.files.get('btn-upload-format', None)
@@ -676,7 +677,7 @@ def upload_single_file(file_request, book, book_id):
                     calibre_db.session.rollback()
                     log.error_or_exception("Database error: {}".format(e))
                     flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-                    return False # return redirect(url_for('web.show_book', book_id=book.id))
+                    return False  # return redirect(url_for('web.show_book', book_id=book.id))
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
@@ -688,6 +689,7 @@ def upload_single_file(file_request, book, book_id):
                 rarExecutable=config.config_rarfile_location)
     return None
 
+
 def upload_cover(cover_request, book):
     requested_file = cover_request.files.get('btn-upload-cover', None)
     if requested_file:
@@ -698,7 +700,7 @@ def upload_cover(cover_request, book):
                 return False
             ret, message = helper.save_cover(requested_file, book.path)
             if ret is True:
-                helper.clear_cover_thumbnail_cache(book.id)
+                helper.replace_cover_thumbnail_cache(book.id)
                 return True
             else:
                 flash(message, category="error")
@@ -739,6 +741,7 @@ def handle_author_on_edit(book, author_name, update_stored=True):
         change = True
     return input_authors, change, renamed
 
+
 @EditBook.route("/admin/book/<int:book_id>", methods=['GET'])
 @login_required_if_no_ano
 @edit_required
@@ -815,6 +818,7 @@ def edit_book(book_id):
                 if result is True:
                     book.has_cover = 1
                     modify_date = True
+                    helper.replace_cover_thumbnail_cache(book.id)
                 else:
                     flash(error, category="error")
 
@@ -986,7 +990,7 @@ def create_book_on_upload(modify_date, meta):
 
     try:
         pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
-    except:
+    except ValueError:
         pubdate = datetime(101, 1, 1)
 
     # Calibre adds books with utc as timezone
@@ -1063,18 +1067,18 @@ def file_handling_on_upload(requested_file):
 def move_coverfile(meta, db_book):
     # move cover to final directory, including book id
     if meta.cover:
-        coverfile = meta.cover
+        cover_file = meta.cover
     else:
-        coverfile = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
-    new_coverpath = os.path.join(config.config_calibre_dir, db_book.path)
+        cover_file = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+    new_cover_path = os.path.join(config.config_calibre_dir, db_book.path)
     try:
-        os.makedirs(new_coverpath, exist_ok=True)
-        copyfile(coverfile, os.path.join(new_coverpath, "cover.jpg"))
+        os.makedirs(new_cover_path, exist_ok=True)
+        copyfile(cover_file, os.path.join(new_cover_path, "cover.jpg"))
         if meta.cover:
             os.unlink(meta.cover)
     except OSError as e:
-        log.error("Failed to move cover file %s: %s", new_coverpath, e)
-        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_coverpath,
+        log.error("Failed to move cover file %s: %s", new_cover_path, e)
+        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_cover_path,
                 error=e),
               category="error")
 
@@ -1193,7 +1197,7 @@ def edit_list_book(param):
     vals = request.form.to_dict()
     book = calibre_db.get_book(vals['pk'])
     sort_param = ""
-    # ret = ""
+    ret = ""
     try:
         if param == 'series_index':
             edit_book_series_index(vals['value'], book)
diff --git a/cps/helper.py b/cps/helper.py
index 43b7141d..ea5820dd 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -820,9 +820,6 @@ def save_cover_from_url(url, book_path):
             log.error("python modul advocate is not installed but is needed")
             return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
-        #            # cover_processing()
-            # move_coverfile(meta, db_book)
-
         return save_cover(img, book_path)
     except (socket.gaierror,
             requests.exceptions.HTTPError,
@@ -1020,7 +1017,7 @@ def render_task_status(tasklist):
             ret['user'] = escape(user)  # prevent xss
 
             # Hidden fields
-            ret['id'] = task.id
+            ret['task_id'] = task.id
             ret['stat'] = task.stat
             ret['is_cancellable'] = task.is_cancellable
 
@@ -1078,8 +1075,12 @@ def get_download_link(book_id, book_format, client):
 
 
 def clear_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id, _("Replace Thumbnail for book {}".format(book_id))),
-                     hidden=True)
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+
+
+def replace_cover_thumbnail_cache(book_id):
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
 
 
 def delete_thumbnail_cache():
diff --git a/cps/kobo.py b/cps/kobo.py
index f2a3b2f8..46e68acb 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -148,8 +148,8 @@ def HandleSyncRequest():
         sync_token.books_last_created = datetime.datetime.min
         sync_token.reading_state_last_modified = datetime.datetime.min
 
-    new_books_last_modified = sync_token.books_last_modified # needed for sync selected shelfs only
-    new_books_last_created = sync_token.books_last_created # needed to distinguish between new and changed entitlement
+    new_books_last_modified = sync_token.books_last_modified  # needed for sync selected shelfs only
+    new_books_last_created = sync_token.books_last_created  # needed to distinguish between new and changed entitlement
     new_reading_state_last_modified = sync_token.reading_state_last_modified
 
     new_archived_last_modified = datetime.datetime.min
@@ -176,18 +176,17 @@ def HandleSyncRequest():
                            .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
                                                                           ub.ArchivedBook.user_id == current_user.id))
                            .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
-                                           .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
-                .filter(ub.BookShelf.date_added > sync_token.books_last_modified)
-                .filter(db.Data.format.in_(KOBO_FORMATS))
-                .filter(calibre_db.common_filters(allow_show_archived=True))
-                .order_by(db.Books.id)
-                .order_by(ub.ArchivedBook.last_modified)
-                .join(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)
-                .join(ub.Shelf)
-                .filter(ub.Shelf.user_id == current_user.id)
-                .filter(ub.Shelf.kobo_sync)
-                .distinct()
-        )
+                                                      .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
+                           .filter(ub.BookShelf.date_added > sync_token.books_last_modified)
+                           .filter(db.Data.format.in_(KOBO_FORMATS))
+                           .filter(calibre_db.common_filters(allow_show_archived=True))
+                           .order_by(db.Books.id)
+                           .order_by(ub.ArchivedBook.last_modified)
+                           .join(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)
+                           .join(ub.Shelf)
+                           .filter(ub.Shelf.user_id == current_user.id)
+                           .filter(ub.Shelf.kobo_sync)
+                           .distinct())
     else:
         if sqlalchemy_version2:
             changed_entries = select(db.Books, ub.ArchivedBook.last_modified, ub.ArchivedBook.is_archived)
@@ -196,16 +195,14 @@ def HandleSyncRequest():
                                                        ub.ArchivedBook.last_modified,
                                                        ub.ArchivedBook.is_archived)
         changed_entries = (changed_entries
-                   .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
-                                                                  ub.ArchivedBook.user_id == current_user.id))
-                   .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
-                                              .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
-                   .filter(calibre_db.common_filters(allow_show_archived=True))
-                   .filter(db.Data.format.in_(KOBO_FORMATS))
-                   .order_by(db.Books.last_modified)
-                   .order_by(db.Books.id)
-        )
-
+                           .join(db.Data).outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                                          ub.ArchivedBook.user_id == current_user.id))
+                           .filter(db.Books.id.notin_(calibre_db.session.query(ub.KoboSyncedBooks.book_id)
+                                                      .filter(ub.KoboSyncedBooks.user_id == current_user.id)))
+                           .filter(calibre_db.common_filters(allow_show_archived=True))
+                           .filter(db.Data.format.in_(KOBO_FORMATS))
+                           .order_by(db.Books.last_modified)
+                           .order_by(db.Books.id))
 
     reading_states_in_new_entitlements = []
     if sqlalchemy_version2:
@@ -215,7 +212,7 @@ def HandleSyncRequest():
     log.debug("Books to Sync: {}".format(len(books.all())))
     for book in books:
         formats = [data.format for data in book.Books.data]
-        if not 'KEPUB' in formats and config.config_kepubifypath and 'EPUB' in formats:
+        if 'KEPUB' not in formats and config.config_kepubifypath and 'EPUB' in formats:
             helper.convert_book_format(book.Books.id, config.config_calibre_dir, 'EPUB', 'KEPUB', current_user.name)
 
         kobo_reading_state = get_or_create_reading_state(book.Books.id)
@@ -262,7 +259,7 @@ def HandleSyncRequest():
             .columns(db.Books).first()
     else:
         max_change = changed_entries.from_self().filter(ub.ArchivedBook.is_archived)\
-            .filter(ub.ArchivedBook.user_id==current_user.id) \
+            .filter(ub.ArchivedBook.user_id == current_user.id) \
             .order_by(func.datetime(ub.ArchivedBook.last_modified).desc()).first()
 
     max_change = max_change.last_modified if max_change else new_archived_last_modified
@@ -425,9 +422,9 @@ def get_author(book):
     author_list = []
     autor_roles = []
     for author in book.authors:
-        autor_roles.append({"Name":author.name})    #.encode('unicode-escape').decode('latin-1')
+        autor_roles.append({"Name": author.name})
         author_list.append(author.name)
-    return {"ContributorRoles": autor_roles, "Contributors":author_list}
+    return {"ContributorRoles": autor_roles, "Contributors": author_list}
 
 
 def get_publisher(book):
@@ -441,6 +438,7 @@ def get_series(book):
         return None
     return book.series[0].name
 
+
 def get_seriesindex(book):
     return book.series_index or 1
 
@@ -485,7 +483,7 @@ def get_metadata(book):
         "Language": "en",
         "PhoneticPronunciations": {},
         "PublicationDate": convert_to_kobo_timestamp_string(book.pubdate),
-        "Publisher": {"Imprint": "", "Name": get_publisher(book),},
+        "Publisher": {"Imprint": "", "Name": get_publisher(book), },
         "RevisionId": book_uuid,
         "Title": book.title,
         "WorkId": book_uuid,
@@ -504,6 +502,7 @@ def get_metadata(book):
 
     return metadata
 
+
 @csrf.exempt
 @kobo.route("/v1/library/tags", methods=["POST", "DELETE"])
 @requires_kobo_auth
@@ -718,7 +717,6 @@ def sync_shelves(sync_token, sync_results, only_kobo_shelves=False):
             *extra_filters
         ).distinct().order_by(func.datetime(ub.Shelf.last_modified).asc())
 
-
     for shelf in shelflist:
         if not shelf_lib.check_shelf_view_permissions(shelf):
             continue
@@ -764,6 +762,7 @@ def create_kobo_tag(shelf):
         )
     return {"Tag": tag}
 
+
 @csrf.exempt
 @kobo.route("/v1/library/<book_uuid>/state", methods=["GET", "PUT"])
 @requires_kobo_auth
@@ -808,7 +807,7 @@ def HandleStateRequest(book_uuid):
                 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:
+                        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
@@ -848,7 +847,7 @@ def get_ub_read_status(kobo_read_status):
 
 def get_or_create_reading_state(book_id):
     book_read = ub.session.query(ub.ReadBook).filter(ub.ReadBook.book_id == book_id,
-                                                          ub.ReadBook.user_id == int(current_user.id)).one_or_none()
+                                                     ub.ReadBook.user_id == int(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:
@@ -912,6 +911,7 @@ def get_current_bookmark_response(current_bookmark):
         }
     return resp
 
+
 @kobo.route("/<book_uuid>/<width>/<height>/<isGreyscale>/image.jpg", defaults={'Quality': ""})
 @kobo.route("/<book_uuid>/<width>/<height>/<Quality>/<isGreyscale>/image.jpg")
 @requires_kobo_auth
@@ -989,8 +989,8 @@ def handle_getests():
     if config.config_kobo_proxy:
         return redirect_or_proxy_request()
     else:
-        testkey = request.headers.get("X-Kobo-userkey","")
-        return make_response(jsonify({"Result": "Success", "TestKey":testkey, "Tests": {}}))
+        testkey = request.headers.get("X-Kobo-userkey", "")
+        return make_response(jsonify({"Result": "Success", "TestKey": testkey, "Tests": {}}))
 
 
 @csrf.exempt
@@ -1020,7 +1020,7 @@ def make_calibre_web_auth_response():
     content = request.get_json()
     AccessToken = base64.b64encode(os.urandom(24)).decode('utf-8')
     RefreshToken = base64.b64encode(os.urandom(24)).decode('utf-8')
-    return  make_response(
+    return make_response(
         jsonify(
             {
                 "AccessToken": AccessToken,
@@ -1158,14 +1158,16 @@ def NATIVE_KOBO_RESOURCES():
         "eula_page": "https://www.kobo.com/termsofuse?style=onestore",
         "exchange_auth": "https://storeapi.kobo.com/v1/auth/exchange",
         "external_book": "https://storeapi.kobo.com/v1/products/books/external/{Ids}",
-        "facebook_sso_page": "https://authorize.kobo.com/signin/provider/Facebook/login?returnUrl=http://store.kobobooks.com/",
+        "facebook_sso_page":
+            "https://authorize.kobo.com/signin/provider/Facebook/login?returnUrl=http://store.kobobooks.com/",
         "featured_list": "https://storeapi.kobo.com/v1/products/featured/{FeaturedListId}",
         "featured_lists": "https://storeapi.kobo.com/v1/products/featured",
         "free_books_page": {
             "EN": "https://www.kobo.com/{region}/{language}/p/free-ebooks",
             "FR": "https://www.kobo.com/{region}/{language}/p/livres-gratuits",
             "IT": "https://www.kobo.com/{region}/{language}/p/libri-gratuiti",
-            "NL": "https://www.kobo.com/{region}/{language}/List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
+            "NL": "https://www.kobo.com/{region}/{language}/"
+                  "List/bekijk-het-overzicht-van-gratis-ebooks/QpkkVWnUw8sxmgjSlCbJRg",
             "PT": "https://www.kobo.com/{region}/{language}/p/livros-gratis",
         },
         "fte_feedback": "https://storeapi.kobo.com/v1/products/ftefeedback",
@@ -1190,7 +1192,8 @@ def NATIVE_KOBO_RESOURCES():
         "library_stack": "https://storeapi.kobo.com/v1/user/library/stacks/{LibraryItemId}",
         "library_sync": "https://storeapi.kobo.com/v1/library/sync",
         "love_dashboard_page": "https://store.kobobooks.com/{culture}/kobosuperpoints",
-        "love_points_redemption_page": "https://store.kobobooks.com/{culture}/KoboSuperPointsRedemption?productId={ProductId}",
+        "love_points_redemption_page":
+            "https://store.kobobooks.com/{culture}/KoboSuperPointsRedemption?productId={ProductId}",
         "magazine_landing_page": "https://store.kobobooks.com/emagazines",
         "notifications_registration_issue": "https://storeapi.kobo.com/v1/notifications/registration",
         "oauth_host": "https://oauth.kobo.com",
@@ -1206,7 +1209,8 @@ def NATIVE_KOBO_RESOURCES():
         "product_recommendations": "https://storeapi.kobo.com/v1/products/{ProductId}/recommendations",
         "product_reviews": "https://storeapi.kobo.com/v1/products/{ProductIds}/reviews",
         "products": "https://storeapi.kobo.com/v1/products",
-        "provider_external_sign_in_page": "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://store.kobobooks.com/",
+        "provider_external_sign_in_page":
+            "https://authorize.kobo.com/ExternalSignIn/{providerName}?returnUrl=http://store.kobobooks.com/",
         "purchase_buy": "https://www.kobo.com/checkout/createpurchase/",
         "purchase_buy_templated": "https://www.kobo.com/{culture}/checkout/createpurchase/{ProductId}",
         "quickbuy_checkout": "https://storeapi.kobo.com/v1/store/quickbuy/{PurchaseId}/checkout",
diff --git a/cps/schedule.py b/cps/schedule.py
index 79e0006c..5500f1a9 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -45,7 +45,7 @@ def get_scheduled_tasks(reconnect=True):
 
 def end_scheduled_tasks():
     worker = WorkerThread.get_instance()
-    for __, __, __, task in worker.tasks:
+    for __, __, __, task, __ in worker.tasks:
         if task.scheduled and task.is_cancellable:
             worker.end_task(task.id)
 
diff --git a/cps/services/worker.py b/cps/services/worker.py
index c1a8c384..63d83bfb 100644
--- a/cps/services/worker.py
+++ b/cps/services/worker.py
@@ -156,7 +156,7 @@ class WorkerThread(threading.Thread):
 
     def end_task(self, task_id):
         ins = self.get_instance()
-        for __, __, __, task in ins.tasks:
+        for __, __, __, task, __ in ins.tasks:
             if str(task.id) == str(task_id) and task.is_cancellable:
                 task.stat = STAT_CANCELLED if task.stat == STAT_WAITING else STAT_ENDED
 
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index bb38fc9f..47c3b70e 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -641,9 +641,9 @@ function UserActions (value, row) {
 /* Function for cancelling tasks */
 function TaskActions (value, row) {
     var cancellableStats = [0, 1, 2];
-    if (row.id && row.is_cancellable && cancellableStats.includes(row.stat)) {
+    if (row.task_id && row.is_cancellable && cancellableStats.includes(row.stat)) {
         return [
-            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.id + "\" title=\"Cancel\">",
+            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.task_id + "\" title=\"Cancel\">",
             "<i class=\"glyphicon glyphicon-ban-circle\"></i>",
             "</div>"
         ].join("");
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index c66c30ec..d11ef50c 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -50,7 +50,7 @@ def get_best_fit(width, height, image_width, image_height):
     resize_height = int(height / 2.0)
     aspect_ratio = image_width / image_height
 
-    # If this image's aspect ratio is different than the first image, then resize this image
+    # If this image's aspect ratio is different from the first image, then resize this image
     # to fill the width and height of the first image
     if aspect_ratio < width / height:
         resize_width = int(width / 2.0)
@@ -225,7 +225,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def __str__(self):
         if self.book_id > 0:
-            return "Add Thumbnail for book {}".format(self.book_id)
+            return "Add Cover Thumbnails for Book {}".format(self.book_id)
         else:
             return "Generate Cover Thumbnails"
 
@@ -501,7 +501,7 @@ class TaskClearCoverThumbnailCache(CalibreTask):
     # needed for logging
     def __str__(self):
         if self.book_id > 0:
-            return "Replace Thumbnail cache for book " + str(self.book_id)
+            return "Replace/Delete Cover Thumbnails for book " + str(self.book_id)
         else:
             return "Delete Thumbnail cache directory"
 
diff --git a/optional-requirements.txt b/optional-requirements.txt
index fea410e5..07e1ad88 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.44.0
+google-api-python-client>=1.7.11,<2.46.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.44.0
+google-api-python-client>=1.7.11,<2.46.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0

From 6e783cd7ee9bd1cf2ea580ad2f359a444efc966f Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 23 Apr 2022 20:08:26 +0200
Subject: [PATCH 201/220] Make Task Stop Action green (marked as clickable)

---
 cps/static/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 47c3b70e..e04c7562 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -643,7 +643,7 @@ function TaskActions (value, row) {
     var cancellableStats = [0, 1, 2];
     if (row.task_id && row.is_cancellable && cancellableStats.includes(row.stat)) {
         return [
-            "<div class=\"task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.task_id + "\" title=\"Cancel\">",
+            "<div class=\"danger task-cancel\" data-toggle=\"modal\" data-target=\"#cancelTaskModal\" data-task-id=\"" + row.task_id + "\" title=\"Cancel\">",
             "<i class=\"glyphicon glyphicon-ban-circle\"></i>",
             "</div>"
         ].join("");

From bf049d8240ecd20195184ebee6dac75c92a5c3cc Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 11:05:22 +0200
Subject: [PATCH 202/220] Make series cover cache invisible

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

diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index cdaec9bd..efbd4c6c 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -178,10 +178,10 @@
             <div class="col-xs-6 col-sm-3">{{_('Generate book cover thumbnails')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_book_covers) }}</div>
           </div>
-          <div class="row">
+          <!--div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Generate series cover thumbnails')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_series_covers) }}</div>
-          </div>
+          </div-->
         </div>
       <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
     </div>
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index f989baf9..599e7997 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -28,10 +28,10 @@
       <input type="checkbox" id="schedule_generate_book_covers" name="schedule_generate_book_covers" {% if config.schedule_generate_book_covers %}checked{% endif %}>
       <label for="schedule_generate_book_covers">{{_('Generate Book Cover Thumbnails')}}</label>
     </div>
-    <div class="form-group">
+    <!--div class="form-group">
       <input type="checkbox" id="schedule_generate_series_covers" name="schedule_generate_series_covers" {% if config.schedule_generate_series_covers %}checked{% endif %}>
       <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
-    </div>
+    </div-->
     <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
     <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Cancel')}}</a>
   </form>

From bc96ff9a3985777f009e2a1b3f49e4e04bd00656 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 11:14:39 +0200
Subject: [PATCH 203/220] Enable scheduled side deleting of thumbnails of
 deleted books

---
 cps/schedule.py        |  3 ++-
 cps/tasks/thumbnail.py | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cps/schedule.py b/cps/schedule.py
index 5500f1a9..1da52d6f 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -21,7 +21,7 @@ import datetime
 from . import config, constants
 from .services.background_scheduler import BackgroundScheduler
 from .tasks.database import TaskReconnectDatabase
-from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails
+from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
 from .services.worker import WorkerThread
 
 
@@ -35,6 +35,7 @@ def get_scheduled_tasks(reconnect=True):
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
         tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers'])
+        tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers'])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index d11ef50c..f6015420 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -16,7 +16,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import division, print_function, unicode_literals
 import os
 from urllib.request import urlopen
 
@@ -449,18 +448,24 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
+        self.calibre_db = db.CalibreDB(expire_on_commit=False)
         self.app_db_session = ub.get_new_session_instance()
         self.cache = fs.FileSystem()
 
     def run(self, worker_thread):
         if self.app_db_session:
-            if self.book_id > 0:    # make sure all thumbnails aren't getting deleted due to a bug
+            if self.book_id == 0:  # delete superfluous thumbnails
+                thumbnails = (self.calibre_db.session.query(ub.Thumbnail)
+                              .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
+                              .filter(db.Books.id == None)
+                              .all())
+            elif self.book_id > 0:  # make sure single book is selected
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
+            if self.book_id < 0:
+                self.delete_all_thumbnails()
+            else:
                 for thumbnail in thumbnails:
                     self.delete_thumbnail(thumbnail)
-            else:
-                self.delete_all_thumbnails()
-
         self._handleSuccess()
         self.app_db_session.remove()
 
@@ -472,7 +477,6 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             .all()
 
     def delete_thumbnail(self, thumbnail):
-        # thumbnail.expiration = datetime.utcnow()
         try:
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.app_db_session \

From 8421a17a82ea8540d4759b0ca4b583b3ea15dad2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 13:15:41 +0200
Subject: [PATCH 204/220] Always catch sqlite create_function error

---
 cps/db.py        |  3 ++-
 cps/editbooks.py | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cps/db.py b/cps/db.py
index 3dd2907d..9f6440aa 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -25,6 +25,7 @@ from datetime import datetime
 from urllib.parse import quote
 import unidecode
 
+from sqlite3 import OperationalError as sqliteOperationalError
 from sqlalchemy import create_engine
 from sqlalchemy import Table, Column, ForeignKey, CheckConstraint
 from sqlalchemy import String, Integer, Boolean, TIMESTAMP, Float
@@ -942,7 +943,7 @@ class CalibreDB:
         conn = conn or self.session.connection().connection.connection
         try:
             conn.create_function("title_sort", 1, _title_sort)
-        except OperationalError:
+        except sqliteOperationalError:
             pass
 
     @classmethod
diff --git a/cps/editbooks.py b/cps/editbooks.py
index f2ad969c..eab79472 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -37,7 +37,7 @@ from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, R
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
-from sqlite3 import OperationalError as sqliteOperationalError
+# from sqlite3 import OperationalError as sqliteOperationalError
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
 from . import config, get_locale, ub, db
 from . import calibre_db
@@ -757,11 +757,11 @@ def edit_book(book_id):
     edit_error = False
 
     # create the function for sorting...
-    try:
-        calibre_db.update_title_sort(config)
-    except sqliteOperationalError as e:
-        log.error_or_exception(e)
-        calibre_db.session.rollback()
+    #try:
+    calibre_db.update_title_sort(config)
+    #except sqliteOperationalError as e:
+    #    log.error_or_exception(e)
+    #    calibre_db.session.rollback()
 
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
     # Book not found

From 1e723dff3a70ca268657e9307dd60cfdab6e95f4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 24 Apr 2022 18:40:50 +0200
Subject: [PATCH 205/220] Make texts in Background thread translatable

---
 cps/about.py             |  6 +++---
 cps/converter.py         |  9 +++++----
 cps/editbooks.py         |  7 ++++---
 cps/helper.py            | 12 +++++++-----
 cps/tasks/convert.py     | 39 ++++++++++++++++++-------------------
 cps/tasks/database.py    | 11 ++++-------
 cps/tasks/mail.py        | 17 ++++++++--------
 cps/tasks/thumbnail.py   | 42 ++++++++++++++++++++--------------------
 cps/tasks/upload.py      |  9 ++++++---
 cps/templates/stats.html |  2 +-
 10 files changed, 78 insertions(+), 76 deletions(-)

diff --git a/cps/about.py b/cps/about.py
index 8f2bf715..92dc41aa 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -69,9 +69,9 @@ _VERSIONS.update(uploader.get_versions(False))
 
 
 def collect_stats():
-    _VERSIONS['ebook converter'] = _(converter.get_calibre_version())
-    _VERSIONS['unrar'] = _(converter.get_unrar_version())
-    _VERSIONS['kepubify'] = _(converter.get_kepubify_version())
+    _VERSIONS['ebook converter'] = converter.get_calibre_version()
+    _VERSIONS['unrar'] = converter.get_unrar_version()
+    _VERSIONS['kepubify'] = converter.get_kepubify_version()
     return _VERSIONS
 
 
diff --git a/cps/converter.py b/cps/converter.py
index bb197467..af2a6c09 100644
--- a/cps/converter.py
+++ b/cps/converter.py
@@ -18,7 +18,8 @@
 
 import os
 import re
-from flask_babel import gettext as _
+
+from flask_babel import lazy_gettext as N_
 
 from . import config, logger
 from .subproc_wrapper import process_wait
@@ -26,9 +27,9 @@ from .subproc_wrapper import process_wait
 
 log = logger.create()
 
-# _() necessary to make babel aware of string for translation
-_NOT_INSTALLED = _('not installed')
-_EXECUTION_ERROR = _('Execution permissions missing')
+# strings getting translated when used
+_NOT_INSTALLED = N_('not installed')
+_EXECUTION_ERROR = N_('Execution permissions missing')
 
 
 def _get_command_version(path, pattern, argument=None):
diff --git a/cps/editbooks.py b/cps/editbooks.py
index eab79472..768f1830 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -25,7 +25,7 @@ from datetime import datetime
 import json
 from shutil import copyfile
 from uuid import uuid4
-from markupsafe import escape
+from markupsafe import escape  # dependency of flask
 from functools import wraps
 
 try:
@@ -35,6 +35,7 @@ except ImportError:
 
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
+from flask_babel import lazy_gettext as N_
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
 # from sqlite3 import OperationalError as sqliteOperationalError
@@ -681,7 +682,7 @@ def upload_single_file(file_request, book, book_id):
 
             # Queue uploader info
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book.id), escape(book.title))
-            upload_text = _(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
+            upload_text = N_(u"File format %(ext)s added to %(book)s", ext=file_ext.upper(), book=link)
             WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(book.title)))
 
             return uploader.process(
@@ -1134,7 +1135,7 @@ def upload():
                 if error:
                     flash(error, category="error")
                 link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
-                upload_text = _(u"File %(file)s uploaded", file=link)
+                upload_text = N_(u"File %(file)s uploaded", file=link)
                 WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
                 helper.add_book_to_thumbnail_cache(book_id)
 
diff --git a/cps/helper.py b/cps/helper.py
index ea5820dd..5c532dba 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -33,6 +33,7 @@ from babel.dates import format_datetime
 from babel.units import format_unit
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
+from flask_babel import lazy_gettext as N_
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -53,7 +54,7 @@ except ImportError:
 
 from . import calibre_db, cli
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub, kobo_sync_status, fs
+from . import logger, config, get_locale, db, ub, fs
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
@@ -111,9 +112,10 @@ def convert_book_format(book_id, calibrepath, old_book_format, new_book_format,
     return None
 
 
+# Texts are not lazy translated as they are supposed to get send out as is
 def send_test_mail(kindle_mail, user_name):
     WorkerThread.add(user_name, TaskEmail(_(u'Calibre-Web test e-mail'), None, None,
-                     config.get_mail_settings(), kindle_mail, _(u"Test e-mail"),
+                     config.get_mail_settings(), kindle_mail, N_(u"Test e-mail"),
                                           _(u'This e-mail has been sent via Calibre-Web.')))
     return
 
@@ -135,7 +137,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
         attachment=None,
         settings=config.get_mail_settings(),
         recipient=e_mail,
-        taskMessage=_(u"Registration e-mail for user: %(name)s", name=user_name),
+        task_message=N_(u"Registration e-mail for user: %(name)s", name=user_name),
         text=txt
     ))
     return
@@ -219,7 +221,7 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
         if entry.format.upper() == book_format.upper():
             converted_file_name = entry.name + '.' + book_format.lower()
             link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(book.title))
-            email_text = _(u"%(book)s send to Kindle", book=link)
+            email_text = N_(u"%(book)s send to Kindle", book=link)
             WorkerThread.add(user_id, TaskEmail(_(u"Send to Kindle"), book.path, converted_file_name,
                              config.get_mail_settings(), kindle_mail,
                              email_text, _(u'This e-mail has been sent via Calibre-Web.')))
@@ -1012,7 +1014,7 @@ def render_task_status(tasklist):
                 else:
                     ret['status'] = _(u'Unknown Status')
 
-            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message) if task.message else _(task.name)
+            ret['taskMessage'] = "{}: {}".format(task.name, task.message) if task.message else task.name
             ret['progress'] = "{} %".format(int(task.progress * 100))
             ret['user'] = escape(user)  # prevent xss
 
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index 028d7dbf..e65d314a 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -18,12 +18,12 @@
 
 import os
 import re
-
 from glob import glob
 from shutil import copyfile
 from markupsafe import escape
 
 from sqlalchemy.exc import SQLAlchemyError
+from flask_babel import lazy_gettext as N_
 
 from cps.services.worker import CalibreTask
 from cps import db
@@ -41,10 +41,10 @@ log = logger.create()
 
 
 class TaskConvert(CalibreTask):
-    def __init__(self, file_path, bookid, taskMessage, settings, kindle_mail, user=None):
-        super(TaskConvert, self).__init__(taskMessage)
+    def __init__(self, file_path, book_id, task_message, settings, kindle_mail, user=None):
+        super(TaskConvert, self).__init__(task_message)
         self.file_path = file_path
-        self.bookid = bookid
+        self.book_id = book_id
         self.title = ""
         self.settings = settings
         self.kindle_mail = kindle_mail
@@ -56,9 +56,9 @@ class TaskConvert(CalibreTask):
         self.worker_thread = worker_thread
         if config.config_use_google_drive:
             worker_db = db.CalibreDB(expire_on_commit=False)
-            cur_book = worker_db.get_book(self.bookid)
+            cur_book = worker_db.get_book(self.book_id)
             self.title = cur_book.title
-            data = worker_db.get_book_format(self.bookid, self.settings['old_book_format'])
+            data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
             df = gdriveutils.getFileFromEbooksFolder(cur_book.path,
                                                      data.name + "." + self.settings['old_book_format'].lower())
             if df:
@@ -89,7 +89,7 @@ class TaskConvert(CalibreTask):
                 # if we're sending to kindle after converting, create a one-off task and run it immediately
                 # todo: figure out how to incorporate this into the progress
                 try:
-                    EmailText = _(u"%(book)s send to Kindle", book=escape(self.title))
+                    EmailText = N_(u"%(book)s send to Kindle", book=escape(self.title))
                     worker_thread.add(self.user, TaskEmail(self.settings['subject'],
                                                            self.results["path"],
                                                            filename,
@@ -106,7 +106,7 @@ class TaskConvert(CalibreTask):
         error_message = None
         local_db = db.CalibreDB(expire_on_commit=False)
         file_path = self.file_path
-        book_id = self.bookid
+        book_id = self.book_id
         format_old_ext = u'.' + self.settings['old_book_format'].lower()
         format_new_ext = u'.' + self.settings['new_book_format'].lower()
 
@@ -114,7 +114,7 @@ class TaskConvert(CalibreTask):
         # if it does - mark the conversion task as complete and return a success
         # this will allow send to kindle workflow to continue to work
         if os.path.isfile(file_path + format_new_ext) or\
-            local_db.get_book_format(self.bookid, self.settings['new_book_format']):
+                local_db.get_book_format(self.book_id, self.settings['new_book_format']):
             log.info("Book id %d already converted to %s", book_id, format_new_ext)
             cur_book = local_db.get_book(book_id)
             self.title = cur_book.title
@@ -133,7 +133,7 @@ class TaskConvert(CalibreTask):
                     local_db.session.rollback()
                     log.error("Database error: %s", e)
                     local_db.session.close()
-                    self._handleError(error_message)
+                    self._handleError(N_("Database error: %(error)s.", error=e))
                     return
                 self._handleSuccess()
                 local_db.session.close()
@@ -150,8 +150,7 @@ class TaskConvert(CalibreTask):
         else:
             # check if calibre converter-executable is existing
             if not os.path.exists(config.config_converterpath):
-                # ToDo Text is not translated
-                self._handleError(_(u"Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
+                self._handleError(N_(u"Calibre ebook-convert %(tool)s not found", tool=config.config_converterpath))
                 return
             check, error_message = self._convert_calibre(file_path, format_old_ext, format_new_ext)
 
@@ -184,11 +183,11 @@ class TaskConvert(CalibreTask):
                     self._handleSuccess()
                 return os.path.basename(file_path + format_new_ext)
             else:
-                error_message = _('%(format)s format not found on disk', format=format_new_ext.upper())
+                error_message = N_('%(format)s format not found on disk', format=format_new_ext.upper())
         local_db.session.close()
         log.info("ebook converter failed with error while converting book")
         if not error_message:
-            error_message = _('Ebook converter failed with unknown error')
+            error_message = N_('Ebook converter failed with unknown error')
         self._handleError(error_message)
         return
 
@@ -198,7 +197,7 @@ class TaskConvert(CalibreTask):
         try:
             p = process_open(command, quotes)
         except OSError as e:
-            return 1, _(u"Kepubify-converter failed: %(error)s", error=e)
+            return 1, N_(u"Kepubify-converter failed: %(error)s", error=e)
         self.progress = 0.01
         while True:
             nextline = p.stdout.readlines()
@@ -219,7 +218,7 @@ class TaskConvert(CalibreTask):
                 copyfile(converted_file[0], (file_path + format_new_ext))
                 os.unlink(converted_file[0])
             else:
-                return 1, _(u"Converted file not found or more than one file in folder %(folder)s",
+                return 1, N_(u"Converted file not found or more than one file in folder %(folder)s",
                             folder=os.path.dirname(file_path))
         return check, None
 
@@ -243,7 +242,7 @@ class TaskConvert(CalibreTask):
 
             p = process_open(command, quotes, newlines=False)
         except OSError as e:
-            return 1, _(u"Ebook-converter failed: %(error)s", error=e)
+            return 1, N_(u"Ebook-converter failed: %(error)s", error=e)
 
         while p.poll() is None:
             nextline = p.stdout.readline()
@@ -266,15 +265,15 @@ class TaskConvert(CalibreTask):
             ele = ele.decode('utf-8', errors="ignore").strip('\n')
             log.debug(ele)
             if not ele.startswith('Traceback') and not ele.startswith('  File'):
-                error_message = _("Calibre failed with error: %(error)s", error=ele)
+                error_message = N_("Calibre failed with error: %(error)s", error=ele)
         return check, error_message
 
     @property
     def name(self):
-        return "Convert"
+        return N_("Convert")
 
     def __str__(self):
-        return "Convert {} {}".format(self.bookid, self.kindle_mail)
+        return "Convert {} {}".format(self.book_id, self.kindle_mail)
 
     @property
     def is_cancellable(self):
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 0441d564..6dd10f7c 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -16,19 +16,16 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from __future__ import division, print_function, unicode_literals
+from urllib.request import urlopen
+
+from flask_babel import lazy_gettext as N_
 
 from cps import config, logger
 from cps.services.worker import CalibreTask
 
-try:
-    from urllib.request import urlopen
-except ImportError as e:
-    from urllib2 import urlopen
-
 
 class TaskReconnectDatabase(CalibreTask):
-    def __init__(self, task_message=u'Reconnecting Calibre database'):
+    def __init__(self, task_message=N_('Reconnecting Calibre database')):
         super(TaskReconnectDatabase, self).__init__(task_message)
         self.log = logger.create()
         self.listen_address = config.get_config_ipaddress()
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index 2a395634..ad38a400 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -26,9 +26,8 @@ from io import StringIO
 from email.message import EmailMessage
 from email.utils import parseaddr
 
-
-from email import encoders
-from email.utils import formatdate, make_msgid
+from flask_babel import lazy_gettext as N_
+from email.utils import formatdate
 from email.generator import Generator
 
 from cps.services.worker import CalibreTask
@@ -111,13 +110,13 @@ class EmailSSL(EmailBase, smtplib.SMTP_SSL):
 
 
 class TaskEmail(CalibreTask):
-    def __init__(self, subject, filepath, attachment, settings, recipient, taskMessage, text, internal=False):
-        super(TaskEmail, self).__init__(taskMessage)
+    def __init__(self, subject, filepath, attachment, settings, recipient, task_message, text, internal=False):
+        super(TaskEmail, self).__init__(task_message)
         self.subject = subject
         self.attachment = attachment
         self.settings = settings
         self.filepath = filepath
-        self.recipent = recipient
+        self.recipient = recipient
         self.text = text
         self.asyncSMTP = None
         self.results = dict()
@@ -139,7 +138,7 @@ class TaskEmail(CalibreTask):
         message = EmailMessage()
         # message = MIMEMultipart()
         message['From'] = self.settings["mail_from"]
-        message['To'] = self.recipent
+        message['To'] = self.recipient
         message['Subject'] = self.subject
         message['Date'] = formatdate(localtime=True)
         message['Message-Id'] = "{}@{}".format(uuid.uuid4(), self.get_msgid_domain()) # f"<{uuid.uuid4()}@{get_msgid_domain(from_)}>" # make_msgid('calibre-web')
@@ -212,7 +211,7 @@ class TaskEmail(CalibreTask):
         gen = Generator(fp, mangle_from_=False)
         gen.flatten(msg)
 
-        self.asyncSMTP.sendmail(self.settings["mail_from"], self.recipent, fp.getvalue())
+        self.asyncSMTP.sendmail(self.settings["mail_from"], self.recipient, fp.getvalue())
         self.asyncSMTP.quit()
         self._handleSuccess()
         log.debug("E-mail send successfully")
@@ -264,7 +263,7 @@ class TaskEmail(CalibreTask):
 
     @property
     def name(self):
-        return "E-mail"
+        return N_("E-mail")
 
     @property
     def is_cancellable(self):
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index f6015420..dcfd4226 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -24,7 +24,7 @@ from cps import config, db, fs, gdriveutils, logger, ub
 from cps.services.worker import CalibreTask, STAT_CANCELLED, STAT_ENDED
 from datetime import datetime
 from sqlalchemy import func, text, or_
-
+from flask_babel import lazy_gettext as N_
 
 try:
     from wand.image import Image
@@ -92,7 +92,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
                 if generated > 0:
                     total_generated += generated
-                    self.message = u'Generated {0} cover thumbnails'.format(total_generated)
+                    self.message = N_(u'Generated %(count)s cover thumbnails', count=total_generated)
 
                 # Check if job has been cancelled or ended
                 if self.stat == STAT_CANCELLED:
@@ -159,8 +159,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error creating book thumbnail: ' + str(ex))
-            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def update_book_cover_thumbnail(self, book, thumbnail):
@@ -171,8 +171,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error updating book thumbnail: ' + str(ex))
-            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def generate_book_thumbnail(self, book, thumbnail):
@@ -199,7 +199,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                             img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
-                    self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                    self.log.info('Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
                     if stream is not None:
@@ -220,7 +220,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'Cover Thumbnails'
+        return N_('Cover Thumbnails')
 
     def __str__(self):
         if self.book_id > 0:
@@ -279,7 +279,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
                 if generated > 0:
                     total_generated += generated
-                    self.message = u'Generated {0} series thumbnails'.format(total_generated)
+                    self.message = N_('Generated {0} series thumbnails').format(total_generated)
 
                 # Check if job has been cancelled or ended
                 if self.stat == STAT_CANCELLED:
@@ -335,8 +335,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error creating book thumbnail: ' + str(ex))
-            self._handleError(u'Error creating book thumbnail: ' + str(ex))
+            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def update_series_thumbnail(self, series_books, thumbnail):
@@ -347,8 +347,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info(u'Error updating book thumbnail: ' + str(ex))
-            self._handleError(u'Error updating book thumbnail: ' + str(ex))
+            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
     def generate_series_thumbnail(self, series_books, thumbnail):
@@ -391,7 +391,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                             canvas.composite(img, left, top)
 
                     except Exception as ex:
-                        self.log.info(u'Error generating thumbnail file: ' + str(ex))
+                        self.log.info('Error generating thumbnail file: ' + str(ex))
                         raise ex
                     finally:
                         if stream is not None:
@@ -433,7 +433,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
     @property
     def name(self):
-        return 'Cover Thumbnails'
+        return N_('Cover Thumbnails')
 
     def __str__(self):
         return "GenerateSeriesThumbnails"
@@ -444,7 +444,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
 
 
 class TaskClearCoverThumbnailCache(CalibreTask):
-    def __init__(self, book_id, task_message=u'Clearing cover thumbnail cache'):
+    def __init__(self, book_id, task_message=N_('Clearing cover thumbnail cache')):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
@@ -486,8 +486,8 @@ class TaskClearCoverThumbnailCache(CalibreTask):
                 .delete()
             self.app_db_session.commit()
         except Exception as ex:
-            self.log.info(u'Error deleting book thumbnail: ' + str(ex))
-            self._handleError(u'Error deleting book thumbnail: ' + str(ex))
+            self.log.info('Error deleting book thumbnail: ' + str(ex))
+            self._handleError('Error deleting book thumbnail: ' + str(ex))
 
     def delete_all_thumbnails(self):
         try:
@@ -495,12 +495,12 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             self.app_db_session.commit()
             self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info(u'Error deleting thumbnail directory: ' + str(ex))
-            self._handleError(u'Error deleting thumbnail directory: ' + str(ex))
+            self.log.info('Error deleting thumbnail directory: ' + str(ex))
+            self._handleError('Error deleting thumbnail directory: ' + str(ex))
 
     @property
     def name(self):
-        return 'Cover Thumbnails'
+        return N_('Cover Thumbnails')
 
     # needed for logging
     def __str__(self):
diff --git a/cps/tasks/upload.py b/cps/tasks/upload.py
index cf5a64ac..bc8ba1e0 100644
--- a/cps/tasks/upload.py
+++ b/cps/tasks/upload.py
@@ -17,11 +17,14 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from datetime import datetime
+
+from flask_babel import lazy_gettext as N_
+
 from cps.services.worker import CalibreTask, STAT_FINISH_SUCCESS
 
 class TaskUpload(CalibreTask):
-    def __init__(self, taskMessage, book_title):
-        super(TaskUpload, self).__init__(taskMessage)
+    def __init__(self, task_message, book_title):
+        super(TaskUpload, self).__init__(task_message)
         self.start_time = self.end_time = datetime.now()
         self.stat = STAT_FINISH_SUCCESS
         self.progress = 1
@@ -32,7 +35,7 @@ class TaskUpload(CalibreTask):
 
     @property
     def name(self):
-        return "Upload"
+        return N_("Upload")
 
     def __str__(self):
         return "Upload {}".format(self.book_title)
diff --git a/cps/templates/stats.html b/cps/templates/stats.html
index 052c920a..62a29308 100644
--- a/cps/templates/stats.html
+++ b/cps/templates/stats.html
@@ -39,7 +39,7 @@
   {% if version %}
     <tr>
       <th>{{library}}</th>
-      <td>{{_(version)}}</td>
+      <td>{{version}}</td>
     </tr>
   {% endif %}
   {% endfor %}

From ae9a970782d54324ab778579a77d9ace5050b21c Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Apr 2022 08:24:14 +0200
Subject: [PATCH 206/220] Add button to update cover cache (for usecase
 sideloaded changed cover) Bugfix logig start background schedue

---
 cps/admin.py                         | 15 ++++++++++++++-
 cps/helper.py                        |  4 ++++
 cps/schedule.py                      | 10 +++++-----
 cps/services/background_scheduler.py | 12 ++++++------
 cps/static/js/main.js                | 11 +++++++++++
 cps/static/js/table.js               |  2 +-
 cps/templates/admin.html             |  6 ++++++
 7 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 1319c42a..91b34eba 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -44,7 +44,7 @@ from . import constants, logger, helper, services, cli
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, \
     kobo_sync_status, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
-    valid_email, check_username
+    valid_email, check_username, update_thumbnail_cache
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from .services.worker import WorkerThread
@@ -169,6 +169,17 @@ def reconnect():
         abort(404)
 
 
+@admi.route("/ajax/updateThumbnails", methods=['POST'])
+@admin_required
+@login_required
+def update_thumbnails():
+    content = config.get_scheduled_task_settings()
+    if content['schedule_generate_book_covers']:
+        log.info("Update of Cover cache requested")
+        update_thumbnail_cache()
+    return ""
+
+
 @admi.route("/admin/view")
 @login_required
 @admin_required
@@ -612,6 +623,8 @@ def load_dialogtexts(element_id):
         texts["main"] = _('Are you sure you want to change shelf sync behavior for the selected user(s)?')
     elif element_id == "db_submit":
         texts["main"] = _('Are you sure you want to change Calibre library location?')
+    elif element_id == "admin_refresh_cover_cache":
+        texts["main"] = _('Calibre-Web will search for updated Covers and update Cover Thumbnails, this may take a while?')
     elif element_id == "btnfullsync":
         texts["main"] = _("Are you sure you want delete Calibre-Web's sync database "
                           "to force a full sync with your Kobo Reader?")
diff --git a/cps/helper.py b/cps/helper.py
index 5c532dba..d97d6475 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -1091,3 +1091,7 @@ def delete_thumbnail_cache():
 
 def add_book_to_thumbnail_cache(book_id):
     WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
+
+
+def update_thumbnail_cache():
+    WorkerThread.add(None, TaskGenerateCoverThumbnails())
diff --git a/cps/schedule.py b/cps/schedule.py
index 1da52d6f..a051bd5f 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -30,16 +30,16 @@ def get_scheduled_tasks(reconnect=True):
 
     # Reconnect Calibre database (metadata.db)
     if reconnect:
-        tasks.append([lambda: TaskReconnectDatabase(), 'reconnect'])
+        tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
-        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers'])
-        tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers'])
+        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False])
+        tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers', True])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
-        tasks.append([lambda: TaskGenerateSeriesThumbnails(), 'generate book covers'])
+        tasks.append([lambda: TaskGenerateSeriesThumbnails(), 'generate book covers', False])
 
     return tasks
 
@@ -86,4 +86,4 @@ def register_startup_tasks():
 
 def should_task_be_running(start, end):
     now = datetime.datetime.now().hour
-    return (start < end and start <= now < end) or (end < start <= now or now < end)
+    return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
diff --git a/cps/services/background_scheduler.py b/cps/services/background_scheduler.py
index eee5b7cd..27285fd9 100644
--- a/cps/services/background_scheduler.py
+++ b/cps/services/background_scheduler.py
@@ -52,32 +52,32 @@ class BackgroundScheduler:
             return self.scheduler.add_job(func=func, trigger=trigger, name=name, **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task(self, task, user=None, name=None, trigger='cron', **trigger_args):
+    def schedule_task(self, task, user=None, name=None, hidden=False, trigger='cron', **trigger_args):
         if use_APScheduler:
             def scheduled_task():
                 worker_task = task()
                 worker_task.scheduled = True
-                WorkerThread.add(user, worker_task)
+                WorkerThread.add(user, worker_task, hidden=hidden)
             return self.schedule(func=scheduled_task, trigger=trigger, name=name, **trigger_args)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks(self, tasks, user=None, trigger='cron', **trigger_args):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], **trigger_args)
+                self.schedule_task(task[0], user=user, trigger=trigger, name=task[1], hidden=task[2], **trigger_args)
 
     # Expects a lambda expression for the task
-    def schedule_task_immediately(self, task, user=None, name=None):
+    def schedule_task_immediately(self, task, user=None, name=None, hidden=False):
         if use_APScheduler:
             def immediate_task():
-                WorkerThread.add(user, task())
+                WorkerThread.add(user, task(), hidden)
             return self.schedule(func=immediate_task, trigger='date', name=name)
 
     # Expects a list of lambda expressions for the tasks
     def schedule_tasks_immediately(self, tasks, user=None):
         if use_APScheduler:
             for task in tasks:
-                self.schedule_task_immediately(task[0], user, name="immediately " + task[1])
+                self.schedule_task_immediately(task[0], user, name="immediately " + task[1], hidden=task[2])
 
     # Remove all jobs
     def remove_all_jobs(self):
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index 91084f06..04d47d6b 100755
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -474,6 +474,17 @@ $(function() {
             }
         });
     });
+    $("#admin_refresh_cover_cache").click(function() {
+        confirmDialog("admin_refresh_cover_cache", "GeneralChangeModal", 0, function () {
+            $.ajax({
+                method:"post",
+                contentType: "application/json; charset=utf-8",
+                dataType: "json",
+                url: getPath() + "/ajax/updateThumbnails",
+            });
+        });
+    });
+
     $("#restart_database").click(function() {
         $("#DialogHeader").addClass("hidden");
         $("#DialogFinished").addClass("hidden");
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index e04c7562..548ca8c4 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -550,7 +550,7 @@ $(function() {
 
     $("#user-table").on("click-cell.bs.table", function (field, value, row, $element) {
         if (value === "denied_column_value") {
-            ConfirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
+            confirmDialog("btndeluser", "GeneralDeleteModal", $element.id, user_handle);
         }
     });
 
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index efbd4c6c..8b0bbc45 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -184,6 +184,9 @@
           </div-->
         </div>
       <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
+      {% if config.schedule_generate_book_covers %}
+        <a class="btn btn-default" id="admin_refresh_cover_cache">{{_('Refresh Thumbnail Cover Cache')}}</a>
+      {%  endif %}
     </div>
   </div>
 
@@ -279,3 +282,6 @@
   </div>
 </div>
 {% endblock %}
+{% block modal %}
+{{ change_confirm_modal() }}
+{% endblock %}

From d83c73103070b2cd943b7cacf88c16f709da7051 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Apr 2022 08:28:29 +0200
Subject: [PATCH 207/220] Reconnect only if reconnect is enabled

---
 cps/admin.py          | 2 +-
 cps/schedule.py       | 4 ++--
 cps/tasks/database.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 91b34eba..6db36dd2 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1681,7 +1681,7 @@ def update_scheduledtasks():
         schedule.end_scheduled_tasks()
 
         # Re-register tasks with new settings
-        schedule.register_scheduled_tasks()
+        schedule.register_scheduled_tasks(cli.reconnect_enable)
     except IntegrityError as ex:
         ub.session.rollback()
         log.error("An unknown error occurred while saving scheduled tasks settings")
diff --git a/cps/schedule.py b/cps/schedule.py
index a051bd5f..5f8b2e86 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -51,7 +51,7 @@ def end_scheduled_tasks():
             worker.end_task(task.id)
 
 
-def register_scheduled_tasks():
+def register_scheduled_tasks(reconnect=True):
     scheduler = BackgroundScheduler()
 
     if scheduler:
@@ -68,7 +68,7 @@ def register_scheduled_tasks():
 
         # Kick-off tasks, if they should currently be running
         if should_task_be_running(start, end):
-            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
+            scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(reconnect))
 
 
 def register_startup_tasks():
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index 6dd10f7c..e5aa26da 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -39,7 +39,7 @@ class TaskReconnectDatabase(CalibreTask):
             urlopen('http://' + address + ':' + str(port) + '/reconnect')
             self._handleSuccess()
         except Exception as ex:
-            self._handleError(u'Unable to reconnect Calibre database: ' + str(ex))
+            self._handleError('Unable to reconnect Calibre database: ' + str(ex))
 
     @property
     def name(self):

From 6e8445fed50fe7150c80f12ef958f9a1fe308fa6 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Mon, 25 Apr 2022 17:00:07 +0200
Subject: [PATCH 208/220] Changed schedule start- and end-time to schedule
 start and duration Localized display of schedule start-time and duration
 Removed displaying scheduling settings if "APScheduler" is missing Input
 check for start-time and duration

---
 cps.py                           |  2 +-
 cps/admin.py                     | 76 +++++++++++++++++++++-----------
 cps/config_sql.py                |  3 +-
 cps/schedule.py                  | 26 ++++++-----
 cps/tasks/database.py            |  1 +
 cps/templates/admin.html         | 15 ++++---
 cps/templates/schedule_edit.html | 17 ++++---
 7 files changed, 90 insertions(+), 50 deletions(-)

diff --git a/cps.py b/cps.py
index 17cceb0a..55d9339c 100755
--- a/cps.py
+++ b/cps.py
@@ -77,7 +77,7 @@ def main():
         app.register_blueprint(oauth)
 
     # Register scheduled tasks
-    register_scheduled_tasks()
+    register_scheduled_tasks()  # ToDo only reconnect if reconnect is enabled
     register_startup_tasks()
 
     success = web_server.start()
diff --git a/cps/admin.py b/cps/admin.py
index 6db36dd2..9dc45096 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -24,13 +24,12 @@ import os
 import re
 import base64
 import json
-import time
 import operator
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, time
 from functools import wraps
 
 from babel import Locale
-from babel.dates import format_datetime
+from babel.dates import format_datetime, format_time, format_timedelta
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
@@ -58,7 +57,8 @@ feature_support = {
         'goodreads': bool(services.goodreads_support),
         'kobo':  bool(services.kobo),
         'updater': constants.UPDATER_AVAILABLE,
-        'gmail': bool(services.gmail)
+        'gmail': bool(services.gmail),
+        'scheduler': schedule.use_APScheduler
     }
 
 try:
@@ -184,6 +184,7 @@ def update_thumbnails():
 @login_required
 @admin_required
 def admin():
+    locale = get_locale()
     version = updater_thread.get_current_version_info()
     if version is False:
         commit = _(u'Unknown')
@@ -198,15 +199,19 @@ def admin():
                     form_date -= timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
                 elif commit[19] == '-':
                     form_date += timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
-            commit = format_datetime(form_date - tz, format='short', locale=get_locale())
+            commit = format_datetime(form_date - tz, format='short', locale=locale)
         else:
             commit = version['version']
 
     all_user = ub.session.query(ub.User).all()
     email_settings = config.get_mail_settings()
-    kobo_support = feature_support['kobo'] and config.config_kobo_sync
+    schedule_time = format_time(time(hour=config.schedule_start_time), format="short", locale=locale)
+    t = timedelta(hours=config.schedule_duration // 60, minutes=config.schedule_duration % 60)
+    schedule_duration = format_timedelta(t, format="short", threshold=.99, locale=locale)
+
     return render_title_template("admin.html", allUser=all_user, email=email_settings, config=config, commit=commit,
-                                 feature_support=feature_support, kobo_support=kobo_support,
+                                 feature_support=feature_support, schedule_time=schedule_time,
+                                 schedule_duration=schedule_duration,
                                  title=_(u"Admin page"), page="admin")
 
 
@@ -1660,36 +1665,57 @@ def update_mailsettings():
 @admin_required
 def edit_scheduledtasks():
     content = config.get_scheduled_task_settings()
-    return render_title_template("schedule_edit.html", config=content, title=_(u"Edit Scheduled Tasks Settings"))
+    time_field = list()
+    duration_field = list()
+
+    locale = get_locale()
+    for n in range(24):
+        time_field.append((n , format_time(time(hour=n), format="short", locale=locale)))
+    for n in range(5, 65, 5):
+        t = timedelta(hours=n // 60, minutes=n % 60)
+        duration_field.append((n, format_timedelta(t, format="short", threshold=.99, locale=locale)))
+
+    return render_title_template("schedule_edit.html", config=content, starttime=time_field, duration=duration_field, title=_(u"Edit Scheduled Tasks Settings"))
 
 
 @admi.route("/admin/scheduledtasks", methods=["POST"])
 @login_required
 @admin_required
 def update_scheduledtasks():
+    error = False
     to_save = request.form.to_dict()
-    _config_int(to_save, "schedule_start_time")
-    _config_int(to_save, "schedule_end_time")
+    if "0" <= to_save.get("schedule_start_time") <= "23":
+        _config_int(to_save, "schedule_start_time")
+    else:
+        flash(_(u"Invalid start time for task specified"), category="error")
+        error = True
+    if "0" < to_save.get("schedule_duration") <= "60":
+        _config_int(to_save, "schedule_duration")
+    else:
+        flash(_(u"Invalid duration for task specified"), category="error")
+        error = True
     _config_checkbox(to_save, "schedule_generate_book_covers")
     _config_checkbox(to_save, "schedule_generate_series_covers")
+    _config_checkbox(to_save, "schedule_reconnect")
 
-    try:
-        config.save()
-        flash(_(u"Scheduled tasks settings updated"), category="success")
+    if not error:
+        try:
+            config.save()
+            flash(_(u"Scheduled tasks settings updated"), category="success")
 
-        # Cancel any running tasks
-        schedule.end_scheduled_tasks()
+            # Cancel any running tasks
+            schedule.end_scheduled_tasks()
 
-        # Re-register tasks with new settings
-        schedule.register_scheduled_tasks(cli.reconnect_enable)
-    except IntegrityError as ex:
-        ub.session.rollback()
-        log.error("An unknown error occurred while saving scheduled tasks settings")
-        flash(_(u"An unknown error occurred. Please try again later."), category="error")
-    except OperationalError:
-        ub.session.rollback()
-        log.error("Settings DB is not Writeable")
-        flash(_("Settings DB is not Writeable"), category="error")
+            # Re-register tasks with new settings
+            schedule.register_scheduled_tasks(config.schedule_reconnect)
+        except IntegrityError:
+            ub.session.rollback()
+            log.error("An unknown error occurred while saving scheduled tasks settings")
+            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+        except OperationalError:
+            ub.session.rollback()
+            log.error("Settings DB is not Writeable")
+            flash(_("Settings DB is not Writeable"), category="error")
 
     return edit_scheduledtasks()
 
diff --git a/cps/config_sql.py b/cps/config_sql.py
index a8beaabb..f4fbb554 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -142,9 +142,10 @@ class _Settings(_Base):
     config_allow_reverse_proxy_header_login = Column(Boolean, default=False)
 
     schedule_start_time = Column(Integer, default=4)
-    schedule_end_time = Column(Integer, default=6)
+    schedule_duration = Column(Integer, default=10)
     schedule_generate_book_covers = Column(Boolean, default=False)
     schedule_generate_series_covers = Column(Boolean, default=False)
+    schedule_reconnect = Column(Boolean, default=False)
 
     def __repr__(self):
         return self.__class__.__name__
diff --git a/cps/schedule.py b/cps/schedule.py
index 5f8b2e86..72f9b230 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -19,7 +19,7 @@
 import datetime
 
 from . import config, constants
-from .services.background_scheduler import BackgroundScheduler
+from .services.background_scheduler import BackgroundScheduler, use_APScheduler
 from .tasks.database import TaskReconnectDatabase
 from .tasks.thumbnail import TaskGenerateCoverThumbnails, TaskGenerateSeriesThumbnails, TaskClearCoverThumbnailCache
 from .services.worker import WorkerThread
@@ -27,7 +27,7 @@ from .services.worker import WorkerThread
 
 def get_scheduled_tasks(reconnect=True):
     tasks = list()
-
+    # config.schedule_reconnect or
     # Reconnect Calibre database (metadata.db)
     if reconnect:
         tasks.append([lambda: TaskReconnectDatabase(), 'reconnect', False])
@@ -59,15 +59,14 @@ def register_scheduled_tasks(reconnect=True):
         scheduler.remove_all_jobs()
 
         start = config.schedule_start_time
-        end = config.schedule_end_time
+        duration = config.schedule_duration
 
         # Register scheduled tasks
-        if start != end:
-            scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
-            scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end)
+        scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
+        scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=start) #  toDo
 
         # Kick-off tasks, if they should currently be running
-        if should_task_be_running(start, end):
+        if should_task_be_running(start, duration):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(reconnect))
 
 
@@ -76,14 +75,17 @@ def register_startup_tasks():
 
     if scheduler:
         start = config.schedule_start_time
-        end = config.schedule_end_time
+        duration = config.schedule_duration
 
         # Run scheduled tasks immediately for development and testing
         # Ignore tasks that should currently be running, as these will be added when registering scheduled tasks
-        if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, end):
+        if constants.APP_MODE in ['development', 'test'] and not should_task_be_running(start, duration):
             scheduler.schedule_tasks_immediately(tasks=get_scheduled_tasks(False))
 
 
-def should_task_be_running(start, end):
-    now = datetime.datetime.now().hour
-    return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
+def should_task_be_running(start, duration):
+    now = datetime.datetime.now()
+    start_time = datetime.datetime.now().replace(hour=start, minute=0, second=0, microsecond=0)
+    end_time = start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
+    return start_time < now < end_time
+    # return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
diff --git a/cps/tasks/database.py b/cps/tasks/database.py
index e5aa26da..afc4db2c 100644
--- a/cps/tasks/database.py
+++ b/cps/tasks/database.py
@@ -31,6 +31,7 @@ class TaskReconnectDatabase(CalibreTask):
         self.listen_address = config.get_config_ipaddress()
         self.listen_port = config.config_port
 
+
     def run(self, worker_thread):
         address = self.listen_address if self.listen_address else 'localhost'
         port = self.listen_port if self.listen_port else 8083
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 8b0bbc45..8a20b73e 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -161,18 +161,18 @@
       <a class="btn btn-default" id="view_config" href="{{url_for('admin.view_configuration')}}">{{_('Edit UI Configuration')}}</a>
     </div>
   </div>
-
+{%  if feature_support['scheduler'] %}
   <div class="row">
     <div class="col">
       <h2>{{_('Scheduled Tasks')}}</h2>
         <div class="col-xs-12 col-sm-12 scheduled_tasks_details">
           <div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Time at which tasks start to run')}}</div>
-            <div class="col-xs-6 col-sm-3">{{config.schedule_start_time}}:00</div>
+            <div class="col-xs-6 col-sm-3">{{schedule_time}}</div>
           </div>
           <div class="row">
-            <div class="col-xs-6 col-sm-3">{{_('Time at which tasks stop running')}}</div>
-            <div class="col-xs-6 col-sm-3">{{config.schedule_end_time}}:00</div>
+            <div class="col-xs-6 col-sm-3">{{_('Maximum tasks duration')}}</div>
+            <div class="col-xs-6 col-sm-3">{{schedule_duration}}</div>
           </div>
           <div class="row">
             <div class="col-xs-6 col-sm-3">{{_('Generate book cover thumbnails')}}</div>
@@ -182,6 +182,11 @@
             <div class="col-xs-6 col-sm-3">{{_('Generate series cover thumbnails')}}</div>
             <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_generate_series_covers) }}</div>
           </div-->
+          <div class="row">
+            <div class="col-xs-6 col-sm-3">{{_('Reconnect to Calibre Library')}}</div>
+            <div class="col-xs-6 col-sm-3">{{ display_bool_setting(config.schedule_reconnect) }}</div>
+          </div>
+
         </div>
       <a class="btn btn-default scheduledtasks" id="admin_edit_scheduled_tasks" href="{{url_for('admin.edit_scheduledtasks')}}">{{_('Edit Scheduled Tasks Settings')}}</a>
       {% if config.schedule_generate_book_covers %}
@@ -189,7 +194,7 @@
       {%  endif %}
     </div>
   </div>
-
+{%  endif %}
   <div class="row form-group">
     <h2>{{_('Administration')}}</h2>
     <a class="btn btn-default" id="debug" href="{{url_for('admin.download_debug')}}">{{_('Download Debug Package')}}</a>
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index 599e7997..55658ce7 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -11,16 +11,16 @@
     <div class="form-group">
       <label for="schedule_start_time">{{_('Time at which tasks start to run')}}</label>
       <select name="schedule_start_time" id="schedule_start_time" class="form-control">
-        {% for n in range(24) %}
-          <option value="{{n}}" {% if config.schedule_start_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+        {% for n in starttime %}
+          <option value="{{n[0]}}" {% if config.schedule_start_time == n[0] %}selected{% endif %}>{{n[1]}}</option>
         {% endfor %}
       </select>
     </div>
     <div class="form-group">
-      <label for="schedule_end_time">{{_('Time at which tasks stop running')}}</label>
-      <select name="schedule_end_time" id="schedule_end_time" class="form-control">
-        {% for n in range(24) %}
-          <option value="{{n}}" {% if config.schedule_end_time == n %}selected{% endif %}>{{n}}{{_(':00')}}</option>
+      <label for="schedule_duration">{{_('Maximum tasks duration')}}</label>
+      <select name="schedule_duration" id="schedule_duration" class="form-control">
+        {% for n in duration %}
+          <option value="{{n[0]}}" {% if config.schedule_duration == n[0] %}selected{% endif %}>{{n[1]}}</option>
         {% endfor %}
       </select>
     </div>
@@ -32,6 +32,11 @@
       <input type="checkbox" id="schedule_generate_series_covers" name="schedule_generate_series_covers" {% if config.schedule_generate_series_covers %}checked{% endif %}>
       <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
     </div-->
+    <div class="form-group">
+      <input type="checkbox" id="schedule_reconnect" name="schedule_reconnect" {% if config.schedule_generate_book_covers %}checked{% endif %}>
+      <label for="schedule_reconnect">{{_('Reconnect to Calibre Library')}}</label>
+    </div>
+
     <button type="submit" name="submit" value="submit" class="btn btn-default">{{_('Save')}}</button>
     <a href="{{ url_for('admin.admin') }}" id="email_back" class="btn btn-default">{{_('Cancel')}}</a>
   </form>

From 21ebdc01303d751aa4fc8cd82781c16ae9907245 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 10:49:06 +0200
Subject: [PATCH 209/220] Bugfixes from testrun

---
 cps/admin.py                            |    4 +-
 cps/schedule.py                         |    2 +-
 test/Calibre-Web TestSummary_Linux.html | 2724 ++++++++++++-----------
 3 files changed, 1367 insertions(+), 1363 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 9dc45096..73442ef2 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1684,12 +1684,12 @@ def edit_scheduledtasks():
 def update_scheduledtasks():
     error = False
     to_save = request.form.to_dict()
-    if "0" <= to_save.get("schedule_start_time") <= "23":
+    if 0 <= int(to_save.get("schedule_start_time")) <= 23:
         _config_int(to_save, "schedule_start_time")
     else:
         flash(_(u"Invalid start time for task specified"), category="error")
         error = True
-    if "0" < to_save.get("schedule_duration") <= "60":
+    if 0 < int(to_save.get("schedule_duration")) <= 60:
         _config_int(to_save, "schedule_duration")
     else:
         flash(_(u"Invalid duration for task specified"), category="error")
diff --git a/cps/schedule.py b/cps/schedule.py
index 72f9b230..8b70da6a 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -34,8 +34,8 @@ def get_scheduled_tasks(reconnect=True):
 
     # Generate all missing book cover thumbnails
     if config.schedule_generate_book_covers:
-        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False])
         tasks.append([lambda: TaskClearCoverThumbnailCache(0), 'delete superfluous book covers', True])
+        tasks.append([lambda: TaskGenerateCoverThumbnails(), 'generate book covers', False])
 
     # Generate all missing series thumbnails
     if config.schedule_generate_series_covers:
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 2ba78125..df55a037 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-02-09 06:42:55</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-25 20:37:58</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>2022-02-09 11:35:55</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-26 02:14:54</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>4h 6 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 44 min</p>
         </div>
       </div>
       </div>
@@ -332,19 +332,28 @@
 
     <tr id="su" class="passClass">
         <td>TestCliGdrivedb</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('c3', 2)">Detail</a>
+            <a onclick="showClassDetail('c3', 3)">Detail</a>
         </td>
     </tr>
 
     
     
         <tr id='pt3.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_folder</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt3.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_cli_gdrive_location</div>
             </td>
@@ -353,7 +362,7 @@
     
     
     
-        <tr id='pt3.2' class='hiddenRow bg-success'>
+        <tr id='pt3.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCliGdrivedb - test_gdrive_db_nonwrite</div>
             </td>
@@ -420,11 +429,11 @@
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertCalibre</td>
         <td class="text-center">15</td>
-        <td class="text-center">2</td>
-        <td class="text-center">13</td>
+        <td class="text-center">15</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -434,33 +443,11 @@
 
     
     
-        <tr id="ft6.1" class="none bg-danger">
+        <tr id='pt6.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_calibre_log</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 606, in test_calibre_log
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Failed&#39;
-- Convert: PDF -&gt; ODT: book9
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -474,281 +461,83 @@ AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Failed&#39;
     
     
     
-        <tr id="ft6.3" class="none bg-danger">
+        <tr id='pt6.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 198, in test_convert_email
-    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: PDF -&gt; ODT: book9&#39; != &#39;Finished&#39;
-- Convert: PDF -&gt; ODT: book9
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.4" class="none bg-danger">
+        <tr id='pt6.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_failed_and_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 242, in test_convert_failed_and_email
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: book6 send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.5" class="none bg-danger">
+        <tr id='pt6.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 328, in test_convert_only
-    self.assertEqual(ret_orig[-6][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; MOBI: book8&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; MOBI: book8
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.6" class="none bg-danger">
+        <tr id='pt6.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_options</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 568, in test_convert_options
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.7" class="none bg-danger">
+        <tr id='pt6.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_parameter</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 164, in test_convert_parameter
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.8" class="none bg-danger">
+        <tr id='pt6.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_wrong_excecutable</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 142, in test_convert_wrong_excecutable
-    self.assertEqual(ret[-2][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: book6 send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: book6 send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.9" class="none bg-danger">
+        <tr id='pt6.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 508, in test_convert_xss
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.10" class="none bg-danger">
+        <tr id='pt6.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_failed</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.10')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.10').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 439, in test_email_failed
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.11" class="none bg-danger">
+        <tr id='pt6.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_email_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.11')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 401, in test_email_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -762,95 +551,29 @@ AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft6.13" class="none bg-danger">
+        <tr id='pt6.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_ssl_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.13')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 482, in test_ssl_smtp_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.14" class="none bg-danger">
+        <tr id='pt6.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_starttls_smtp_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.14')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 462, in test_starttls_smtp_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Failed&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft6.15" class="none bg-danger">
+        <tr id='pt6.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibre - test_user_convert_xss</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft6.15')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft6.15" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft6.15').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert.py&#34;, line 542, in test_user_convert_xss
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
-- Convert: MOBI -&gt; EPUB: Buuko
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -858,37 +581,91 @@ AssertionError: &#39;Convert: MOBI -&gt; EPUB: Buuko&#39; != &#39;Finished&#39;
 
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
+        <td class="text-center">7</td>
         <td class="text-center">6</td>
-        <td class="text-center">0</td>
-        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c7', 6)">Detail</a>
+            <a onclick="showClassDetail('c7', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft7.1" class="none bg-danger">
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt7.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft7.7" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEbookConvertCalibreGDrive - test_thumbnail_cache</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.7')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                <div id="div_ft7.7" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.1').style.display='none'"><span
+                                onclick="document.getElementById('div_ft7.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 193, in test_convert_email
-    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 441, in test_thumbnail_cache
+    self.assertTrue(os.path.exists(thumbnail_cache_path))
 AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -898,168 +675,13 @@ AssertionError: False is not true</pre>
         </tr>
     
     
-    
-        <tr id="ft7.2" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_failed_and_email</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 234, in test_convert_failed_and_email
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Failed&#39;
-- E-mail: Test e-mail
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.3" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_only</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 324, in test_convert_only
-    self.assertEqual(ret[-6][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
-- E-mail: Test e-mail
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.4" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_parameter</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 158, in test_convert_parameter
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; LIT: book8
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.5" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_failed</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 430, in test_email_failed
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Failed&#39;
-- Convert: EPUB -&gt; LIT: book8
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft7.6" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEbookConvertCalibreGDrive - test_email_only</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 389, in test_email_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; LIT: book8
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</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">
@@ -1078,33 +700,11 @@ AssertionError: &#39;Convert: EPUB -&gt; LIT: book8&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft8.2" class="none bg-danger">
+        <tr id='pt8.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft8.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft8.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft8.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify.py&#34;, line 126, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; KEPUB: book7
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1119,11 +719,11 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEbookConvertGDriveKepubify</td>
         <td class="text-center">3</td>
-        <td class="text-center">2</td>
-        <td class="text-center">1</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">
@@ -1142,33 +742,11 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="ft9.2" class="none bg-danger">
+        <tr id='pt9.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertGDriveKepubify - test_convert_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft9.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft9.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft9.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_kepubify_gdrive.py&#34;, line 174, in test_convert_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
-- Convert: EPUB -&gt; KEPUB: book7
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1183,15 +761,15 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="errorClass">
         <td>TestEditAdditionalBooks</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">10</td>
         <td class="text-center">2</td>
+        <td class="text-center">4</td>
+        <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c10', 19)">Detail</a>
+            <a onclick="showClassDetail('c10', 17)">Detail</a>
         </td>
     </tr>
 
@@ -1242,11 +820,34 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.6' class='hiddenRow bg-success'>
+        <tr id="ft10.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</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.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 461, in test_edit_book_identifier
+    self.assertEqual(&#39;Hallo1&#39;, list(result[&#39;identifier&#39;][-1].keys())[0])
+AssertionError: &#39;Hallo1&#39; != &#39;Hallo&#39;
+- Hallo1
+?      -
++ Hallo</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1260,11 +861,31 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.8' class='hiddenRow bg-success'>
+        <tr id="ft10.8" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</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.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft10.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 614, in test_edit_book_identifier_standard
+    self.assertEqual(final_length, reference_length)
+AssertionError: 14 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1305,41 +926,26 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.13' class='hiddenRow bg-success'>
+        <tr id="et10.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt10.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="st10.15" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_calibre_database</div>
-            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st10.15')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.13')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st10.15" class="popup_window test_output" style="display:none;">
+                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st10.15').style.display='none'"><span
+                                onclick="document.getElementById('div_et10.13').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
-                        <pre class="text-left">Not implemented</pre>
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 166, in test_upload_metadata_cbr
+    self.assertEqual(&#39;Test 执book&#39;, details[&#39;title&#39;])
+KeyError: &#39;title&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1349,16 +955,46 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.16' class='hiddenRow bg-success'>
+        <tr id="et10.14" class="none bg-info">
             <td>
-                <div class='testcase'>TestEditAdditionalBooks - test_writeonly_path</div>
+                <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.14')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.14" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 185, in test_upload_metadata_cbt
+    self.fill_basic_config({&#39;config_uploading&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='st10.17' class='none bg-warning'>
+        <tr id='st10.15' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_author_edit</div>
             </td>
@@ -1367,20 +1003,145 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt10.18' class='hiddenRow bg-success'>
+        <tr id="et10.16" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</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_et10.16')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.16" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 810, in test_xss_comment_edit
+    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt10.19' class='hiddenRow bg-success'>
+        <tr id="et10.17" class="none bg-info">
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</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_et10.17')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et10.17" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 832, in test_xss_custom_comment_edit
+    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">2</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('c11', 2)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et11.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 44, in tearDownClass
+    cls.stop_calibre_web()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 475, in stop_calibre_web
+    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
+    self.error_handler.check_response(response)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
+    raise exception_class(message, screen, stacktrace)
+selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et11.2" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_thumbnail_env)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et11.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et11.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 26, in setUpClass
+    add_dependency(cls.json_line, cls.__name__)
+AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;json_line&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -1394,13 +1155,13 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c11', 36)">Detail</a>
+            <a onclick="showClassDetail('c12', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt11.1' class='hiddenRow bg-success'>
+        <tr id='pt12.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1409,7 +1170,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.2' class='hiddenRow bg-success'>
+        <tr id='pt12.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1418,7 +1179,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.3' class='hiddenRow bg-success'>
+        <tr id='pt12.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1427,7 +1188,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.4' class='hiddenRow bg-success'>
+        <tr id='pt12.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1436,7 +1197,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.5' class='hiddenRow bg-success'>
+        <tr id='pt12.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1445,7 +1206,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.6' class='hiddenRow bg-success'>
+        <tr id='pt12.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1454,7 +1215,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.7' class='hiddenRow bg-success'>
+        <tr id='pt12.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1463,7 +1224,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.8' class='hiddenRow bg-success'>
+        <tr id='pt12.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1472,7 +1233,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.9' class='hiddenRow bg-success'>
+        <tr id='pt12.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1481,7 +1242,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.10' class='hiddenRow bg-success'>
+        <tr id='pt12.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1490,7 +1251,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.11' class='hiddenRow bg-success'>
+        <tr id='pt12.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1499,7 +1260,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.12' class='hiddenRow bg-success'>
+        <tr id='pt12.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1508,7 +1269,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.13' class='hiddenRow bg-success'>
+        <tr id='pt12.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1517,7 +1278,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.14' class='hiddenRow bg-success'>
+        <tr id='pt12.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1526,7 +1287,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.15' class='hiddenRow bg-success'>
+        <tr id='pt12.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1535,7 +1296,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.16' class='hiddenRow bg-success'>
+        <tr id='pt12.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1544,7 +1305,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.17' class='hiddenRow bg-success'>
+        <tr id='pt12.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1553,7 +1314,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.18' class='hiddenRow bg-success'>
+        <tr id='pt12.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1562,7 +1323,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.19' class='hiddenRow bg-success'>
+        <tr id='pt12.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1571,19 +1332,19 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="st11.20" class="none bg-warning">
+        <tr id="st12.20" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st11.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st12.20" 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.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st12.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1597,7 +1358,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.21' class='hiddenRow bg-success'>
+        <tr id='pt12.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1606,7 +1367,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.22' class='hiddenRow bg-success'>
+        <tr id='pt12.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1615,7 +1376,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.23' class='hiddenRow bg-success'>
+        <tr id='pt12.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1624,7 +1385,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.24' class='hiddenRow bg-success'>
+        <tr id='pt12.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1633,7 +1394,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.25' class='hiddenRow bg-success'>
+        <tr id='pt12.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1642,7 +1403,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.26' class='hiddenRow bg-success'>
+        <tr id='pt12.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1651,7 +1412,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.27' class='hiddenRow bg-success'>
+        <tr id='pt12.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1660,7 +1421,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.28' class='hiddenRow bg-success'>
+        <tr id='pt12.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1669,7 +1430,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.29' class='hiddenRow bg-success'>
+        <tr id='pt12.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1678,7 +1439,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.30' class='hiddenRow bg-success'>
+        <tr id='pt12.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1687,7 +1448,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.31' class='hiddenRow bg-success'>
+        <tr id='pt12.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1696,7 +1457,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.32' class='hiddenRow bg-success'>
+        <tr id='pt12.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1705,7 +1466,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.33' class='hiddenRow bg-success'>
+        <tr id='pt12.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1714,7 +1475,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.34' class='hiddenRow bg-success'>
+        <tr id='pt12.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1723,7 +1484,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.35' class='hiddenRow bg-success'>
+        <tr id='pt12.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1732,7 +1493,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id='pt11.36' class='hiddenRow bg-success'>
+        <tr id='pt12.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1742,82 +1503,13 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditAuthors</td>
         <td class="text-center">6</td>
-        <td class="text-center">6</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('c12', 6)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt12.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt12.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>TestEditAuthorsGdrive</td>
-        <td class="text-center">6</td>
         <td class="text-center">5</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c13', 6)">Detail</a>
         </td>
@@ -1827,7 +1519,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1836,7 +1528,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1845,7 +1537,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1854,7 +1546,7 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
         <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1862,6 +1554,103 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
         <tr id='pt13.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft13.6" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft13.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author.py&#34;, line 471, in test_rename_capital_on_upload
+    self.assertEqual([&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;], details[&#39;author&#39;])
+AssertionError: Lists differ: [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;] != [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
+
+Second list contains 1 additional elements.
+First extra element 4:
+&#39;Liu Yang&#39;
+
+- [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;]
++ [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
+?                                                                    ++++++++++++</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="failClass">
+        <td>TestEditAuthorsGdrive</td>
+        <td class="text-center">6</td>
+        <td class="text-center">5</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c14', 6)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt14.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1870,26 +1659,33 @@ AssertionError: &#39;Convert: EPUB -&gt; KEPUB: book7&#39; != &#39;Finished&#39;
     
     
     
-        <tr id="et13.6" class="none bg-info">
+        <tr id="ft14.6" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et13.6')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.6')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et13.6" class="popup_window test_output" style="display:block;">
+                <div id="div_ft14.6" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et13.6').style.display='none'"><span
+                                onclick="document.getElementById('div_ft14.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 547, in test_rename_capital_on_upload
-    self.assertEqual(&#39;Useless&#39;, details[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 564, in test_rename_capital_on_upload
+    self.assertEqual([&#39;Asterix Lionherd&#39;], details[&#39;author&#39;])
+AssertionError: Lists differ: [&#39;Asterix Lionherd&#39;] != [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]
+
+Second list contains 1 additional elements.
+First extra element 1:
+&#39;Asterix Lionherd&#39;
+
+- [&#39;Asterix Lionherd&#39;]
++ [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1908,13 +1704,13 @@ KeyError: &#39;title&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c14', 18)">Detail</a>
+            <a onclick="showClassDetail('c15', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt14.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1923,7 +1719,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.2' class='hiddenRow bg-success'>
+        <tr id='pt15.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1932,7 +1728,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.3' class='hiddenRow bg-success'>
+        <tr id='pt15.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1941,7 +1737,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.4' class='hiddenRow bg-success'>
+        <tr id='pt15.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1950,7 +1746,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.5' class='hiddenRow bg-success'>
+        <tr id='pt15.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1959,7 +1755,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.6' class='hiddenRow bg-success'>
+        <tr id='pt15.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1968,7 +1764,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.7' class='hiddenRow bg-success'>
+        <tr id='pt15.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1977,7 +1773,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.8' class='hiddenRow bg-success'>
+        <tr id='pt15.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1986,7 +1782,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.9' class='hiddenRow bg-success'>
+        <tr id='pt15.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1995,7 +1791,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.10' class='hiddenRow bg-success'>
+        <tr id='pt15.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -2004,7 +1800,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.11' class='hiddenRow bg-success'>
+        <tr id='pt15.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -2013,7 +1809,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.12' class='hiddenRow bg-success'>
+        <tr id='pt15.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -2022,7 +1818,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.13' class='hiddenRow bg-success'>
+        <tr id='pt15.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -2031,7 +1827,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.14' class='hiddenRow bg-success'>
+        <tr id='pt15.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -2040,7 +1836,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.15' class='hiddenRow bg-success'>
+        <tr id='pt15.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -2049,7 +1845,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.16' class='hiddenRow bg-success'>
+        <tr id='pt15.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -2058,7 +1854,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.17' class='hiddenRow bg-success'>
+        <tr id='pt15.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -2067,7 +1863,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt14.18' class='hiddenRow bg-success'>
+        <tr id='pt15.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -2085,13 +1881,13 @@ KeyError: &#39;title&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 1)">Detail</a>
+            <a onclick="showClassDetail('c16', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -2103,19 +1899,19 @@ KeyError: &#39;title&#39;</pre>
 
     <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
-        <td class="text-center">20</td>
-        <td class="text-center">20</td>
+        <td class="text-center">18</td>
+        <td class="text-center">18</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('c16', 20)">Detail</a>
+            <a onclick="showClassDetail('c17', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -2124,7 +1920,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -2133,7 +1929,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -2142,7 +1938,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.4' class='hiddenRow bg-success'>
+        <tr id='pt17.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -2151,7 +1947,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.5' class='hiddenRow bg-success'>
+        <tr id='pt17.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -2160,7 +1956,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.6' class='hiddenRow bg-success'>
+        <tr id='pt17.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -2169,7 +1965,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.7' class='hiddenRow bg-success'>
+        <tr id='pt17.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -2178,7 +1974,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.8' class='hiddenRow bg-success'>
+        <tr id='pt17.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -2187,7 +1983,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.9' class='hiddenRow bg-success'>
+        <tr id='pt17.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -2196,7 +1992,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.10' class='hiddenRow bg-success'>
+        <tr id='pt17.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -2205,7 +2001,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.11' class='hiddenRow bg-success'>
+        <tr id='pt17.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -2214,7 +2010,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.12' class='hiddenRow bg-success'>
+        <tr id='pt17.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2223,7 +2019,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.13' class='hiddenRow bg-success'>
+        <tr id='pt17.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2232,7 +2028,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.14' class='hiddenRow bg-success'>
+        <tr id='pt17.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2241,7 +2037,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.15' class='hiddenRow bg-success'>
+        <tr id='pt17.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2250,7 +2046,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.16' class='hiddenRow bg-success'>
+        <tr id='pt17.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2259,16 +2055,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.17' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_epub</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id='pt17.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -2277,16 +2064,7 @@ KeyError: &#39;title&#39;</pre>
     
     
     
-        <tr id='pt16.19' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditBooksOnGdrive - test_upload_cover_hdd</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt16.20' class='hiddenRow bg-success'>
+        <tr id='pt17.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2304,13 +2082,13 @@ KeyError: &#39;title&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 1)">Detail</a>
+            <a onclick="showClassDetail('c18', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -2320,83 +2098,39 @@ KeyError: &#39;title&#39;</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestSTARTTLS</td>
         <td class="text-center">3</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</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('c18', 3)">Detail</a>
+            <a onclick="showClassDetail('c19', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft18.1" class="none bg-danger">
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 81, in test_STARTTLS
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;E-mail: Test e-mail&#39; != &#39;Finished&#39;
-- E-mail: Test e-mail
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft18.2" class="none bg-danger">
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft18.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft18.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft18.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_STARTTLS.py&#34;, line 102, in test_STARTTLS_SSL_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: Buuko send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2406,83 +2140,39 @@ AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestSSL</td>
         <td class="text-center">7</td>
-        <td class="text-center">3</td>
-        <td class="text-center">3</td>
-        <td class="text-center">1</td>
+        <td class="text-center">7</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('c19', 7)">Detail</a>
+            <a onclick="showClassDetail('c20', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft19.1" class="none bg-danger">
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 122, in test_SSL_None_setup_error
-    self.assertEqual(&#39;Failed&#39;, ret[-1][&#39;result&#39;])
-AssertionError: &#39;Failed&#39; != &#39;E-mail: Buuko send to Kindle&#39;
-- Failed
-+ E-mail: Buuko send to Kindle</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft19.2" class="none bg-danger">
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 101, in test_SSL_STARTTLS_setup_error
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Failed&#39;)
-AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
-- E-mail: Buuko send to Kindle
-+ Failed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2491,7 +2181,7 @@ AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
     
     
     
-        <tr id='pt19.4' class='hiddenRow bg-success'>
+        <tr id='pt20.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2500,67 +2190,25 @@ AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Failed&#39;
     
     
     
-        <tr id="ft19.5" class="none bg-danger">
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft19.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft19.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft19.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 79, in test_SSL_only
-    self.assertEqual(ret[-1][&#39;result&#39;], &#39;Finished&#39;)
-AssertionError: &#39;E-mail: Buuko send to Kindle&#39; != &#39;Finished&#39;
-- E-mail: Buuko send to Kindle
-+ Finished</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et19.6" class="none bg-info">
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et19.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et19.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et19.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_email_ssl.py&#34;, line 167, in test_email_limit
-    details = self.get_book_details(int(book_details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
-ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2578,13 +2226,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 1)">Detail</a>
+            <a onclick="showClassDetail('c21', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2602,13 +2250,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 2)">Detail</a>
+            <a onclick="showClassDetail('c22', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2617,7 +2265,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2635,13 +2283,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 3)">Detail</a>
+            <a onclick="showClassDetail('c23', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2650,19 +2298,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="st22.2" class="none bg-warning">
+        <tr id="st23.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st22.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st23.2" 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_st22.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st23.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2676,7 +2324,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2694,13 +2342,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 1)">Detail</a>
+            <a onclick="showClassDetail('c24', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2718,13 +2366,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 3)">Detail</a>
+            <a onclick="showClassDetail('c25', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2733,7 +2381,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2742,7 +2390,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2760,13 +2408,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('c26', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -2775,7 +2423,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -2784,7 +2432,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
@@ -2793,7 +2441,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
@@ -2802,7 +2450,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -2811,7 +2459,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -2820,7 +2468,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -2829,7 +2477,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -2838,7 +2486,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -2847,7 +2495,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.10' class='hiddenRow bg-success'>
+        <tr id='pt26.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -2856,7 +2504,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -2866,39 +2514,108 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestKoboSyncBig</td>
-        <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
+        <td class="text-center">6</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
+            <a onclick="showClassDetail('c27', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id="ft27.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft27.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 472, in test_download_cover
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et27.2" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt26.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelfs</div>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 412, in test_kobo_sync_multi_user
+    self.check_element_on_page((By.XPATH, &#34;//*[@id=&#39;archived_cb&#39;]&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id="et27.3" class="none bg-info">
+            <td>
+                <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelves</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 279, in test_kobo_sync_selected_shelves
+    self.check_element_on_page((By.ID, &#34;add-to-shelf&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
@@ -2907,7 +2624,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
@@ -2916,7 +2633,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
@@ -2934,13 +2651,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 13)">Detail</a>
+            <a onclick="showClassDetail('c28', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -2949,7 +2666,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -2958,7 +2675,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -2967,7 +2684,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -2976,7 +2693,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -2985,7 +2702,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -2994,7 +2711,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3003,7 +2720,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3012,7 +2729,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3021,7 +2738,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3030,7 +2747,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.11' class='hiddenRow bg-success'>
+        <tr id='pt28.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -3039,7 +2756,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.12' class='hiddenRow bg-success'>
+        <tr id='pt28.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -3048,7 +2765,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt27.13' class='hiddenRow bg-success'>
+        <tr id='pt28.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -3060,19 +2777,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
 
     <tr id="su" class="passClass">
         <td>TestCalibreWebListOrders</td>
-        <td class="text-center">8</td>
-        <td class="text-center">8</td>
+        <td class="text-center">10</td>
+        <td class="text-center">10</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('c28', 8)">Detail</a>
+            <a onclick="showClassDetail('c29', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3081,7 +2798,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3090,7 +2807,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -3099,7 +2816,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -3108,7 +2825,25 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -3117,7 +2852,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -3126,7 +2861,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -3135,7 +2870,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -3153,13 +2888,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 9)">Detail</a>
+            <a onclick="showClassDetail('c30', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -3168,7 +2903,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -3177,7 +2912,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
@@ -3186,7 +2921,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -3195,19 +2930,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="st29.5" class="none bg-warning">
+        <tr id="st30.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st29.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st30.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_st29.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st30.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -3221,7 +2956,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -3230,7 +2965,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -3239,7 +2974,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -3248,7 +2983,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -3266,13 +3001,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 15)">Detail</a>
+            <a onclick="showClassDetail('c31', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -3281,7 +3016,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -3290,7 +3025,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -3299,7 +3034,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -3308,7 +3043,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -3317,7 +3052,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -3326,7 +3061,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -3335,7 +3070,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -3344,7 +3079,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -3353,7 +3088,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -3362,7 +3097,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -3371,7 +3106,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -3380,7 +3115,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -3389,7 +3124,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -3398,7 +3133,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -3416,13 +3151,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -3431,7 +3166,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -3449,13 +3184,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c33', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -3464,7 +3199,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -3482,13 +3217,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c33', 23)">Detail</a>
+            <a onclick="showClassDetail('c34', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -3497,7 +3232,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id='pt34.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -3506,7 +3241,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.3' class='hiddenRow bg-success'>
+        <tr id='pt34.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -3515,7 +3250,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.4' class='hiddenRow bg-success'>
+        <tr id='pt34.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -3524,7 +3259,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.5' class='hiddenRow bg-success'>
+        <tr id='pt34.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -3533,7 +3268,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.6' class='hiddenRow bg-success'>
+        <tr id='pt34.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -3542,7 +3277,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.7' class='hiddenRow bg-success'>
+        <tr id='pt34.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -3551,7 +3286,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.8' class='hiddenRow bg-success'>
+        <tr id='pt34.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -3560,7 +3295,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.9' class='hiddenRow bg-success'>
+        <tr id='pt34.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -3569,7 +3304,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.10' class='hiddenRow bg-success'>
+        <tr id='pt34.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -3578,7 +3313,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.11' class='hiddenRow bg-success'>
+        <tr id='pt34.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -3587,7 +3322,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.12' class='hiddenRow bg-success'>
+        <tr id='pt34.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -3596,7 +3331,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.13' class='hiddenRow bg-success'>
+        <tr id='pt34.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -3605,7 +3340,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.14' class='hiddenRow bg-success'>
+        <tr id='pt34.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -3614,7 +3349,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.15' class='hiddenRow bg-success'>
+        <tr id='pt34.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -3623,7 +3358,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.16' class='hiddenRow bg-success'>
+        <tr id='pt34.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -3632,7 +3367,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.17' class='hiddenRow bg-success'>
+        <tr id='pt34.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -3641,7 +3376,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.18' class='hiddenRow bg-success'>
+        <tr id='pt34.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -3650,7 +3385,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.19' class='hiddenRow bg-success'>
+        <tr id='pt34.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -3659,7 +3394,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.20' class='hiddenRow bg-success'>
+        <tr id='pt34.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -3668,7 +3403,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.21' class='hiddenRow bg-success'>
+        <tr id='pt34.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -3677,7 +3412,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.22' class='hiddenRow bg-success'>
+        <tr id='pt34.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -3686,7 +3421,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt33.23' class='hiddenRow bg-success'>
+        <tr id='pt34.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -3704,13 +3439,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -3721,68 +3456,46 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
 
 
     <tr id="su" class="errorClass">
-        <td>TestReader</td>
-        <td class="text-center">5</td>
-        <td class="text-center">4</td>
+        <td>_FailedTest</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id="et36.1" class="none bg-info">
             <td>
-                <div class='testcase'>TestReader - test_comic_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt35.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestReader - test_epub_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt35.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestReader - test_pdf_reader</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="et35.4" class="none bg-info">
-            <td>
-                <div class='testcase'>TestReader - test_sound_listener</div>
+                <div class='testcase'>_FailedTest - test_pip_install</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et35.4')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et35.4" class="popup_window test_output" style="display:block;">
+                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et35.4').style.display='none'"><span
+                                onclick="document.getElementById('div_et36.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 222, in sound_test
-    self.delete_book(int(details[&#39;cover&#39;].split(&#39;/&#39;)[-1].split(&#39;?&#39;)[0]))
-ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
+                        <pre class="text-left">ImportError: Failed to import test module: test_pip_install
+Traceback (most recent call last):
+  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 436, in _find_test_path
+    module = self._get_module_from_name(name)
+  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 377, in _get_module_from_name
+    __import__(name)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pip_install.py&#34;, line 15, in &lt;module&gt;
+    from build import make_release
+  File &#34;/home/ozzie/Development/calibre-web-test/build/make_release.py&#34;, line 14, in &lt;module&gt;
+    from helper_environment import environment, add_dependency
+ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_environment&#39; (/home/ozzie/Development/calibre-web-test/test/helper_environment.py)</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3791,8 +3504,59 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         </tr>
     
     
+
+
+    <tr id="su" class="passClass">
+        <td>TestReader</td>
+        <td class="text-center">5</td>
+        <td class="text-center">5</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('c37', 5)">Detail</a>
+        </td>
+    </tr>
+
     
-        <tr id='pt35.5' class='hiddenRow bg-success'>
+    
+        <tr id='pt37.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_comic_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt37.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_epub_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt37.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_pdf_reader</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt37.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReader - test_sound_listener</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt37.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -3802,6 +3566,30 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
 
 
+    <tr id="su" class="passClass">
+        <td>TestReadOnlyDatabase</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</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('c38', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt38.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestReconnect</td>
         <td class="text-center">1</td>
@@ -3810,13 +3598,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c39', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt36.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -3834,13 +3622,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 8)">Detail</a>
+            <a onclick="showClassDetail('c40', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -3849,7 +3637,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -3858,7 +3646,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -3867,7 +3655,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id='pt40.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -3876,7 +3664,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt40.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -3885,7 +3673,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.6' class='hiddenRow bg-success'>
+        <tr id='pt40.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -3894,7 +3682,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.7' class='hiddenRow bg-success'>
+        <tr id='pt40.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -3903,7 +3691,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt37.8' class='hiddenRow bg-success'>
+        <tr id='pt40.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -3921,13 +3709,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 3)">Detail</a>
+            <a onclick="showClassDetail('c41', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
@@ -3936,7 +3724,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt38.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
@@ -3945,7 +3733,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt38.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
@@ -3963,13 +3751,13 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 16)">Detail</a>
+            <a onclick="showClassDetail('c42', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -3978,7 +3766,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.2' class='hiddenRow bg-success'>
+        <tr id='pt42.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -3987,7 +3775,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.3' class='hiddenRow bg-success'>
+        <tr id='pt42.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -3996,7 +3784,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.4' class='hiddenRow bg-success'>
+        <tr id='pt42.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -4005,7 +3793,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.5' class='hiddenRow bg-success'>
+        <tr id='pt42.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -4014,7 +3802,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.6' class='hiddenRow bg-success'>
+        <tr id='pt42.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -4023,7 +3811,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.7' class='hiddenRow bg-success'>
+        <tr id='pt42.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -4032,7 +3820,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.8' class='hiddenRow bg-success'>
+        <tr id='pt42.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -4041,7 +3829,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.9' class='hiddenRow bg-success'>
+        <tr id='pt42.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -4050,7 +3838,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.10' class='hiddenRow bg-success'>
+        <tr id='pt42.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -4059,7 +3847,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.11' class='hiddenRow bg-success'>
+        <tr id='pt42.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -4068,7 +3856,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.12' class='hiddenRow bg-success'>
+        <tr id='pt42.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -4077,7 +3865,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.13' class='hiddenRow bg-success'>
+        <tr id='pt42.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -4086,19 +3874,19 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="st39.14" class="none bg-warning">
+        <tr id="st42.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st39.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st39.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st42.14" 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_st39.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st42.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4112,7 +3900,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.15' class='hiddenRow bg-success'>
+        <tr id='pt42.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -4121,7 +3909,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt39.16' class='hiddenRow bg-success'>
+        <tr id='pt42.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -4131,21 +3919,248 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>TestUpdater</td>
-        <td class="text-center">9</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</td>
+    <tr id="su" class="failClass">
+        <td>TestThumbnails</td>
+        <td class="text-center">8</td>
+        <td class="text-center">0</td>
+        <td class="text-center">7</td>
+        <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 9)">Detail</a>
+            <a onclick="showClassDetail('c43', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id="ft43.1" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 210, in test_cache_non_writable
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.2" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 178, in test_cache_of_deleted_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.3" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 77, in test_cover_cache_on_database_change
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.4" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 117, in test_cover_change_on_upload_new_cover
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='st43.5' class='none bg-warning'>
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_for_series</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.6" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 224, in test_cover_on_upload_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.7" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 152, in test_remove_cover_from_cache
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.8" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 262, in test_sideloaded_book
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="failClass">
+        <td>TestUpdater</td>
+        <td class="text-center">9</td>
+        <td class="text-center">7</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c44', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -4154,7 +4169,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -4163,7 +4178,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -4172,7 +4187,7 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt44.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -4181,41 +4196,26 @@ ValueError: invalid literal for int() with base 10: &#39;og&#39;</pre>
     
     
     
-        <tr id="et40.5" class="none bg-info">
+        <tr id="ft44.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et40.5')">ERROR</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_et40.5" class="popup_window test_output" style="display:block;">
+                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et40.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 381, in test_perform_update
-    button.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;button id=&#34;DialogFinished&#34; class=&#34;btn btn-default hidden&#34; type=&#34;button&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 359, in test_perform_update
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4225,63 +4225,28 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id="et40.6" class="none bg-info">
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et40.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et40.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et40.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 318, in test_perform_update_stable_errors
-    performUpdate.click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 81, in click
-    self._execute(Command.CLICK_ELEMENT)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webelement.py&#34;, line 710, in _execute
-    return self._parent.execute(command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 424, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.ElementNotInteractableException: Message: Element &lt;div id=&#34;perform_update&#34; class=&#34;btn btn-primary hidden&#34;&gt; could not be scrolled into view
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-ElementNotInteractableError@chrome://remote/content/shared/webdriver/Errors.jsm:293:5
-webdriverClickElement@chrome://remote/content/marionette/interaction.js:156:11
-interaction.clickElement@chrome://remote/content/marionette/interaction.js:125:11
-clickElement@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:203:24
-receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild.jsm:91:31</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="st40.7" class="none bg-warning">
+        <tr id="st44.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st40.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st44.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st40.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st44.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_st40.7').style.display='none'"><span
+                                onclick="document.getElementById('div_st44.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4295,7 +4260,7 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt44.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -4304,26 +4269,50 @@ receiveMessage@chrome://remote/content/marionette/actors/MarionetteCommandsChild
     
     
     
-        <tr id="ft40.9" class="none bg-danger">
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestUploadEPubs</td>
+        <td class="text-center">4</td>
+        <td class="text-center">3</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c45', 4)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et45.1" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft40.9')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et45.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft40.9" class="popup_window test_output" style="display:block;">
+                <div id="div_et45.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft40.9').style.display='none'"><span
+                                onclick="document.getElementById('div_et45.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 409, in test_update_write_protect
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;message&#34;)))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 188, in test_upload_epub_cover
+    os.remove(&#39;cover_image.png&#39;)
+FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4332,23 +4321,17 @@ AssertionError: False is not true</pre>
         </tr>
     
     
-
-
-    <tr id="su" class="passClass">
-        <td>TestUploadEPubs</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">
-            <a onclick="showClassDetail('c41', 2)">Detail</a>
-        </td>
-    </tr>
-
+    
+        <tr id='pt45.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUploadEPubs - test_upload_epub_cover_formats</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+    
+        <tr id='pt45.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_duplicate</div>
             </td>
@@ -4357,7 +4340,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id='pt45.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_lang</div>
             </td>
@@ -4375,13 +4358,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c42', 18)">Detail</a>
+            <a onclick="showClassDetail('c46', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt46.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_edit_user_email</div>
             </td>
@@ -4390,7 +4373,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt46.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_list_visibility</div>
             </td>
@@ -4399,7 +4382,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt46.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_admin_role</div>
             </td>
@@ -4408,7 +4391,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt46.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_check_sort</div>
             </td>
@@ -4417,7 +4400,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt46.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_denied_tags</div>
             </td>
@@ -4426,7 +4409,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt46.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_download_role</div>
             </td>
@@ -4435,7 +4418,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt46.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_button</div>
             </td>
@@ -4444,7 +4427,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt46.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_email</div>
             </td>
@@ -4453,7 +4436,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt46.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_kindle</div>
             </td>
@@ -4462,7 +4445,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt46.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_language</div>
             </td>
@@ -4471,7 +4454,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt46.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_locale</div>
             </td>
@@ -4480,7 +4463,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt46.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_name</div>
             </td>
@@ -4489,7 +4472,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt46.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_edit_visiblility</div>
             </td>
@@ -4498,7 +4481,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.14' class='hiddenRow bg-success'>
+        <tr id='pt46.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_guest_edit</div>
             </td>
@@ -4507,7 +4490,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt46.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_remove_admin</div>
             </td>
@@ -4516,7 +4499,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt46.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_requests</div>
             </td>
@@ -4525,7 +4508,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.17' class='hiddenRow bg-success'>
+        <tr id='pt46.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_search</div>
             </td>
@@ -4534,7 +4517,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.18' class='hiddenRow bg-success'>
+        <tr id='pt46.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserList - test_user_list_sort</div>
             </td>
@@ -4552,13 +4535,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 1)">Detail</a>
+            <a onclick="showClassDetail('c47', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt43.1' class='hiddenRow bg-success'>
+        <tr id='pt47.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -4576,13 +4559,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 21)">Detail</a>
+            <a onclick="showClassDetail('c48', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt48.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -4591,7 +4574,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id='pt48.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -4600,7 +4583,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.3' class='hiddenRow bg-success'>
+        <tr id='pt48.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -4609,7 +4592,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.4' class='hiddenRow bg-success'>
+        <tr id='pt48.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -4618,7 +4601,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.5' class='hiddenRow bg-success'>
+        <tr id='pt48.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -4627,7 +4610,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt48.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -4636,7 +4619,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.7' class='hiddenRow bg-success'>
+        <tr id='pt48.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -4645,7 +4628,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='pt48.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -4654,7 +4637,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id='pt48.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -4663,7 +4646,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.10' class='hiddenRow bg-success'>
+        <tr id='pt48.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -4672,7 +4655,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.11' class='hiddenRow bg-success'>
+        <tr id='pt48.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -4681,7 +4664,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.12' class='hiddenRow bg-success'>
+        <tr id='pt48.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -4690,7 +4673,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.13' class='hiddenRow bg-success'>
+        <tr id='pt48.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -4699,7 +4682,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.14' class='hiddenRow bg-success'>
+        <tr id='pt48.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -4708,7 +4691,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.15' class='hiddenRow bg-success'>
+        <tr id='pt48.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -4717,7 +4700,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.16' class='hiddenRow bg-success'>
+        <tr id='pt48.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -4726,7 +4709,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.17' class='hiddenRow bg-success'>
+        <tr id='pt48.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -4735,7 +4718,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.18' class='hiddenRow bg-success'>
+        <tr id='pt48.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -4744,7 +4727,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.19' class='hiddenRow bg-success'>
+        <tr id='pt48.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -4753,7 +4736,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.20' class='hiddenRow bg-success'>
+        <tr id='pt48.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -4762,7 +4745,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.21' class='hiddenRow bg-success'>
+        <tr id='pt48.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -4774,19 +4757,19 @@ AssertionError: False is not true</pre>
 
     <tr id="su" class="passClass">
         <td>TestCalibreWebVisibilitys</td>
-        <td class="text-center">34</td>
-        <td class="text-center">34</td>
+        <td class="text-center">35</td>
+        <td class="text-center">35</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('c45', 34)">Detail</a>
+            <a onclick="showClassDetail('c49', 35)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt45.1' class='hiddenRow bg-success'>
+        <tr id='pt49.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -4795,7 +4778,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.2' class='hiddenRow bg-success'>
+        <tr id='pt49.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -4804,7 +4787,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.3' class='hiddenRow bg-success'>
+        <tr id='pt49.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -4813,7 +4796,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.4' class='hiddenRow bg-success'>
+        <tr id='pt49.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -4822,7 +4805,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.5' class='hiddenRow bg-success'>
+        <tr id='pt49.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -4831,7 +4814,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.6' class='hiddenRow bg-success'>
+        <tr id='pt49.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -4840,7 +4823,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.7' class='hiddenRow bg-success'>
+        <tr id='pt49.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -4849,7 +4832,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.8' class='hiddenRow bg-success'>
+        <tr id='pt49.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -4858,7 +4841,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.9' class='hiddenRow bg-success'>
+        <tr id='pt49.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -4867,7 +4850,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.10' class='hiddenRow bg-success'>
+        <tr id='pt49.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -4876,7 +4859,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.11' class='hiddenRow bg-success'>
+        <tr id='pt49.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -4885,7 +4868,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.12' class='hiddenRow bg-success'>
+        <tr id='pt49.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -4894,7 +4877,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.13' class='hiddenRow bg-success'>
+        <tr id='pt49.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -4903,7 +4886,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.14' class='hiddenRow bg-success'>
+        <tr id='pt49.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -4912,7 +4895,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.15' class='hiddenRow bg-success'>
+        <tr id='pt49.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -4921,7 +4904,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.16' class='hiddenRow bg-success'>
+        <tr id='pt49.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -4930,7 +4913,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.17' class='hiddenRow bg-success'>
+        <tr id='pt49.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -4939,7 +4922,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.18' class='hiddenRow bg-success'>
+        <tr id='pt49.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -4948,7 +4931,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.19' class='hiddenRow bg-success'>
+        <tr id='pt49.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -4957,7 +4940,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.20' class='hiddenRow bg-success'>
+        <tr id='pt49.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -4966,7 +4949,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.21' class='hiddenRow bg-success'>
+        <tr id='pt49.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -4975,7 +4958,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.22' class='hiddenRow bg-success'>
+        <tr id='pt49.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -4984,7 +4967,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.23' class='hiddenRow bg-success'>
+        <tr id='pt49.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -4993,7 +4976,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.24' class='hiddenRow bg-success'>
+        <tr id='pt49.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -5002,7 +4985,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.25' class='hiddenRow bg-success'>
+        <tr id='pt49.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -5011,7 +4994,16 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.26' class='hiddenRow bg-success'>
+        <tr id='pt49.26' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreWebVisibilitys - test_read_status_visible</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt49.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_request_link_column_to_read_status</div>
             </td>
@@ -5020,7 +5012,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.27' class='hiddenRow bg-success'>
+        <tr id='pt49.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -5029,7 +5021,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.28' class='hiddenRow bg-success'>
+        <tr id='pt49.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -5038,7 +5030,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.29' class='hiddenRow bg-success'>
+        <tr id='pt49.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -5047,7 +5039,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.30' class='hiddenRow bg-success'>
+        <tr id='pt49.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -5056,7 +5048,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.31' class='hiddenRow bg-success'>
+        <tr id='pt49.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -5065,7 +5057,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.32' class='hiddenRow bg-success'>
+        <tr id='pt49.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -5074,7 +5066,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.33' class='hiddenRow bg-success'>
+        <tr id='pt49.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -5083,7 +5075,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt45.34' class='hiddenRow bg-success'>
+        <tr id='pt49.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -5101,13 +5093,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c46', 16)">Detail</a>
+            <a onclick="showClassDetail('c50', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt46.1' class='hiddenRow bg-success'>
+        <tr id='pt50.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -5116,7 +5108,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.2' class='hiddenRow bg-success'>
+        <tr id='pt50.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -5125,7 +5117,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.3' class='hiddenRow bg-success'>
+        <tr id='pt50.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -5134,7 +5126,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.4' class='hiddenRow bg-success'>
+        <tr id='pt50.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -5143,7 +5135,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.5' class='hiddenRow bg-success'>
+        <tr id='pt50.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -5152,7 +5144,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.6' class='hiddenRow bg-success'>
+        <tr id='pt50.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -5161,7 +5153,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.7' class='hiddenRow bg-success'>
+        <tr id='pt50.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -5170,7 +5162,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.8' class='hiddenRow bg-success'>
+        <tr id='pt50.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -5179,7 +5171,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.9' class='hiddenRow bg-success'>
+        <tr id='pt50.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -5188,7 +5180,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.10' class='hiddenRow bg-success'>
+        <tr id='pt50.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -5197,7 +5189,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.11' class='hiddenRow bg-success'>
+        <tr id='pt50.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -5206,7 +5198,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.12' class='hiddenRow bg-success'>
+        <tr id='pt50.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -5215,7 +5207,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.13' class='hiddenRow bg-success'>
+        <tr id='pt50.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -5224,7 +5216,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.14' class='hiddenRow bg-success'>
+        <tr id='pt50.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -5233,7 +5225,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.15' class='hiddenRow bg-success'>
+        <tr id='pt50.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -5242,7 +5234,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt46.16' class='hiddenRow bg-success'>
+        <tr id='pt50.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -5253,10 +5245,10 @@ AssertionError: False is not true</pre>
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>404</td>
-        <td>365</td>
-        <td>27</td>
-        <td>5</td>
+        <td>420</td>
+        <td>389</td>
+        <td>14</td>
+        <td>10</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5285,7 +5277,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.13.0-28-generic #31~20.04.1-Ubuntu SMP Wed Jan 19 14:08:10 UTC 2022 x86_64 x86_64</td>
+              <td>Linux 5.13.0-40-generic #45~20.04.1-Ubuntu SMP Mon Apr 4 09:38:31 UTC 2022 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -5295,15 +5287,21 @@ AssertionError: False is not true</pre>
               <td>Basic</td>
             </tr>
           
+            <tr>
+              <th>advocate</th>
+              <td>1.0.0</td>
+              <td>Basic</td>
+            </tr>
+          
             <tr>
               <th>APScheduler</th>
-              <td>3.7.0</td>
+              <td>3.9.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>Babel</th>
-              <td>2.9.1</td>
+              <td>2.10.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5321,7 +5319,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask</th>
-              <td>2.0.2</td>
+              <td>2.0.3</td>
               <td>Basic</td>
             </tr>
           
@@ -5333,7 +5331,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-Login</th>
-              <td>0.5.0</td>
+              <td>0.6.0</td>
               <td>Basic</td>
             </tr>
           
@@ -5345,7 +5343,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-WTF</th>
-              <td>1.0.0</td>
+              <td>1.0.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5363,25 +5361,31 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>3.0.3</td>
+              <td>3.1.1</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>lxml</th>
-              <td>4.7.1</td>
+              <td>4.8.0</td>
+              <td>Basic</td>
+            </tr>
+          
+            <tr>
+              <th>pyasn1</th>
+              <td>0.4.8</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>PyPDF3</th>
-              <td>1.0.5</td>
+              <td>1.0.6</td>
               <td>Basic</td>
             </tr>
           
             <tr>
               <th>pytz</th>
-              <td>2021.3</td>
+              <td>2022.1</td>
               <td>Basic</td>
             </tr>
           
@@ -5393,7 +5397,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.31</td>
+              <td>1.4.35</td>
               <td>Basic</td>
             </tr>
           
@@ -5405,7 +5409,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Unidecode</th>
-              <td>1.3.2</td>
+              <td>1.3.4</td>
               <td>Basic</td>
             </tr>
           
@@ -5423,7 +5427,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5441,7 +5445,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5453,7 +5457,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5471,7 +5475,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5483,7 +5487,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5501,7 +5505,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5525,7 +5529,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5543,7 +5547,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5555,13 +5559,13 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadata</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5579,7 +5583,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5591,19 +5595,19 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>beautifulsoup4</th>
-              <td>4.10.0</td>
+              <td>4.11.1</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>scholarly</th>
-              <td>1.5.1</td>
+              <td>1.6.0</td>
               <td>TestLoadMetadataScholar</td>
             </tr>
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.36.0</td>
+              <td>2.45.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5621,7 +5625,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>PyDrive2</th>
-              <td>1.10.0</td>
+              <td>1.10.1</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5675,7 +5679,7 @@ AssertionError: False is not true</pre>
           
             <tr>
               <th>Flask-Dance</th>
-              <td>5.1.0</td>
+              <td>6.0.0</td>
               <td>TestOAuthLogin</td>
             </tr>
           
@@ -5693,7 +5697,7 @@ AssertionError: False is not true</pre>
 </div>
 
 <script>
-    drawCircle(365, 27, 5, 7);
+    drawCircle(389, 14, 10, 7);
     showCase(5);
 </script>
 

From 2b03cae0171068fc2cac4514ce248e234a056d35 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 10:55:11 +0200
Subject: [PATCH 210/220] Bugfix scheduler end task

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

diff --git a/cps/schedule.py b/cps/schedule.py
index 8b70da6a..9bc248f1 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -63,7 +63,9 @@ def register_scheduled_tasks(reconnect=True):
 
         # Register scheduled tasks
         scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
-        scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=start) #  toDo
+        end_time = calclulate_end_time(start, duration)
+        scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end_time.hour,
+                           minute=end_time.minute)
 
         # Kick-off tasks, if they should currently be running
         if should_task_be_running(start, duration):
@@ -88,4 +90,8 @@ def should_task_be_running(start, duration):
     start_time = datetime.datetime.now().replace(hour=start, minute=0, second=0, microsecond=0)
     end_time = start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
     return start_time < now < end_time
-    # return (start < end and start <= now < end) or (end < start and (now < end or start <= now ))
+
+def calclulate_end_time(start, duration):
+    start_time = datetime.datetime.now().replace(hour=start, minute=0)
+    return start_time + datetime.timedelta(hours=duration // 60, minutes=duration % 60)
+

From 9410b47144a4c78397701398e2c8f15ce2ebdc40 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 11:04:00 +0200
Subject: [PATCH 211/220] Refactored startup for compatibility with pyinstaller
 5.0

---
 cps.py                   |  77 +++---------------
 cps/__init__.py          |  84 ++++++++++++-------
 cps/admin.py             |   2 +-
 cps/cli.py               | 169 ++++++++++++++++++++-------------------
 cps/config_sql.py        |  32 ++++----
 cps/db.py                |   8 +-
 cps/editbooks.py         |  28 +++----
 cps/gdriveutils.py       |   9 ++-
 cps/main.py              |  71 ++++++++++++++++
 cps/tasks/mail.py        |   5 +-
 cps/templates/admin.html |   2 +-
 cps/ub.py                |   8 +-
 cps/updater.py           |  12 ++-
 setup.cfg                |   6 +-
 14 files changed, 283 insertions(+), 230 deletions(-)
 create mode 100644 cps/main.py

diff --git a/cps.py b/cps.py
index 55d9339c..91bb1d74 100755
--- a/cps.py
+++ b/cps.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 #  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-#    Copyright (C) 2012-2019  OzzieIsaacs
+#    Copyright (C) 2022 OzzieIsaacs
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -17,72 +17,19 @@
 #  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 sys
 import os
+import sys
 
+# Are we running from commandline?
+if __package__ == '':
+    # Add local path to sys.path so we can import cps
+    path = os.path.dirname(os.path.dirname(__file__))
+    sys.path.insert(0, path)
 
-# Insert local directories into path
-sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'vendor'))
-
-
-from cps import create_app
-from cps import web_server
-from cps.opds import opds
-from cps.web import web
-from cps.jinjia import jinjia
-from cps.about import about
-from cps.shelf import shelf
-from cps.admin import admi
-from cps.gdrive import gdrive
-from cps.editbooks import EditBook
-from cps.remotelogin import remotelogin
-from cps.search_metadata import meta
-from cps.error_handler import init_errorhandler
-from cps.schedule import register_scheduled_tasks, register_startup_tasks
-
-try:
-    from cps.kobo import kobo, get_kobo_activated
-    from cps.kobo_auth import kobo_auth
-    kobo_available = get_kobo_activated()
-except (ImportError, AttributeError):   # Catch also error for not installed flask-WTF (missing csrf decorator)
-    kobo_available = False
-
-try:
-    from cps.oauth_bb import oauth
-    oauth_available = True
-except ImportError:
-    oauth_available = False
-
-
-def main():
-    app = create_app()
-
-    init_errorhandler()
-
-    app.register_blueprint(web)
-    app.register_blueprint(opds)
-    app.register_blueprint(jinjia)
-    app.register_blueprint(about)
-    app.register_blueprint(shelf)
-    app.register_blueprint(admi)
-    app.register_blueprint(remotelogin)
-    app.register_blueprint(meta)
-    app.register_blueprint(gdrive)
-    app.register_blueprint(EditBook)
-    if kobo_available:
-        app.register_blueprint(kobo)
-        app.register_blueprint(kobo_auth)
-    if oauth_available:
-        app.register_blueprint(oauth)
-
-    # Register scheduled tasks
-    register_scheduled_tasks()  # ToDo only reconnect if reconnect is enabled
-    register_startup_tasks()
-
-    success = web_server.start()
-    sys.exit(0 if success else 1)
-
+from cps.main import main as _main
 
 if __name__ == '__main__':
-    main()
+    _main()
+
+
+
diff --git a/cps/__init__.py b/cps/__init__.py
index 68947905..269599ad 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -19,8 +19,6 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
-__package__ = "cps"
-
 import sys
 import os
 import mimetypes
@@ -28,15 +26,23 @@ import mimetypes
 from babel import Locale as LC
 from babel import negotiate_locale
 from babel.core import UnknownLocaleError
-from flask import Flask, request, g
+from flask import request, g
+from flask import Flask
 from .MyLoginManager import MyLoginManager
 from flask_babel import Babel
 from flask_principal import Principal
 
-from . import config_sql, logger, cache_buster, cli, ub, db
+from . import config_sql
+from . import logger
+from . import cache_buster
+from .cli import CliParameter
+from .constants import CONFIG_DIR
+from . import ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
+from . import services
+from .updater import Updater
 
 try:
     import lxml
@@ -50,6 +56,7 @@ try:
 except ImportError:
     wtf_present = False
 
+
 mimetypes.init()
 mimetypes.add_type('application/xhtml+xml', '.xhtml')
 mimetypes.add_type('application/epub+zip', '.epub')
@@ -81,37 +88,55 @@ app.config.update(
 
 
 lm = MyLoginManager()
-lm.login_view = 'web.login'
-lm.anonymous_user = ub.Anonymous
-lm.session_protection = 'strong'
-
-if wtf_present:
-    csrf = CSRFProtect()
-    csrf.init_app(app)
-else:
-    csrf = None
-
-ub.init_db(cli.settings_path)
-# pylint: disable=no-member
-config = config_sql.load_configuration(ub.session)
-
-web_server = WebServer()
 
 babel = Babel()
 _BABEL_TRANSLATIONS = set()
 
 log = logger.create()
 
+config = config_sql._ConfigSQL()
 
-from . import services
-
-db.CalibreDB.update_config(config)
-db.CalibreDB.setup_db(config.config_calibre_dir, cli.settings_path)
+cli_param = CliParameter()
 
+if wtf_present:
+    csrf = CSRFProtect()
+else:
+    csrf = None
 
 calibre_db = db.CalibreDB()
 
+web_server = WebServer()
+
+updater_thread = Updater()
+
+
 def create_app():
+    lm.login_view = 'web.login'
+    lm.anonymous_user = ub.Anonymous
+    lm.session_protection = 'strong'
+
+    if csrf:
+        csrf.init_app(app)
+
+    cli_param.init()
+
+    ub.init_db(os.path.join(CONFIG_DIR, "app.db"), cli_param.user_credentials)
+
+    # ub.init_db(os.path.join(CONFIG_DIR, "app.db"))
+    # pylint: disable=no-member
+    config_sql.load_configuration(config, ub.session, cli_param)
+
+    db.CalibreDB.update_config(config)
+    db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
+    calibre_db.init_db()
+
+    updater_thread.init_updater(config, web_server)
+    # Perform dry run of updater and exit afterwards
+    if cli_param.dry_run:
+        updater_thread.dry_run()
+        sys.exit(0)
+    updater_thread.start()
+
     if sys.version_info < (3, 0):
         log.info(
             '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, please update your installation to Python3 ***')
@@ -156,7 +181,7 @@ def create_app():
         services.goodreads_support.connect(config.config_goodreads_api_key,
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
-    config.store_calibre_uuid(calibre_db, db.LibraryId)
+    config.store_calibre_uuid(calibre_db, db.Library_Id)
     return app
 
 
@@ -179,11 +204,8 @@ def get_locale():
     return negotiate_locale(preferred or ['en'], _BABEL_TRANSLATIONS)
 
 
-from .updater import Updater
-updater_thread = Updater()
+'''@babel.timezoneselector
+def get_timezone():
+    user = getattr(g, 'user', None)
+    return user.timezone if user else None'''
 
-# Perform dry run of updater and exit afterwards
-if cli.dry_run:
-    updater_thread.dry_run()
-    sys.exit(0)
-updater_thread.start()
diff --git a/cps/admin.py b/cps/admin.py
index 73442ef2..46da062e 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -1254,7 +1254,7 @@ def _db_configuration_update_helper():
         if not calibre_db.setup_db(to_save['config_calibre_dir'], ub.app_DB_path):
             return _db_configuration_result(_('DB Location is not Valid, Please Enter Correct Path'),
                                             gdrive_error)
-        config.store_calibre_uuid(calibre_db, db.LibraryId)
+        config.store_calibre_uuid(calibre_db, db.Library_Id)
         # if db changed -> delete shelfs, delete download books, delete read books, kobo sync...
         if db_change:
             log.info("Calibre Database changed, all Calibre-Web info related to old Database gets deleted")
diff --git a/cps/cli.py b/cps/cli.py
index 629fd76d..cf4f36fb 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -31,96 +31,99 @@ def version_info():
         return "Calibre-Web version: %s - unkown git-clone" % _STABLE_VERSION['version']
     return "Calibre-Web version: %s -%s" % (_STABLE_VERSION['version'], _NIGHTLY_VERSION[1])
 
+class CliParameter(object):
 
-parser = argparse.ArgumentParser(description='Calibre Web is a web app'
-                                 ' 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',
-                    help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
-parser.add_argument('-k', metavar='path',
-                    help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
-parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-Web',
-                    version=version_info())
-parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
-parser.add_argument('-s', metavar='user:pass', help='Sets specific username to new password and exits Calibre-Web')
-parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
-parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
-parser.add_argument('-d', action='store_true', help='Dry run of updater to check file permissions in advance '
-                                                    'and exits Calibre-Web')
-parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
-args = parser.parse_args()
+    def init(self):
+        self.arg_parser()
 
-settings_path = args.p or os.path.join(_CONFIG_DIR, DEFAULT_SETTINGS_FILE)
-gd_path = args.g or os.path.join(_CONFIG_DIR, DEFAULT_GDRIVE_FILE)
+    def arg_parser(self):
+        parser = argparse.ArgumentParser(description='Calibre Web is a web app'
+                                                     ' 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',
+                            help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
+        parser.add_argument('-k', metavar='path',
+                            help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
+        parser.add_argument('-v', '--version', action='version', help='Shows version number and exits Calibre-Web',
+                            version=version_info())
+        parser.add_argument('-i', metavar='ip-address', help='Server IP-Address to listen')
+        parser.add_argument('-s', metavar='user:pass',
+                            help='Sets specific username to new password and exits Calibre-Web')
+        parser.add_argument('-f', action='store_true', help='Flag is depreciated and will be removed in next version')
+        parser.add_argument('-l', action='store_true', help='Allow loading covers from localhost')
+        parser.add_argument('-d', action='store_true', help='Dry run of updater to check file permissions in advance '
+                                                            'and exits Calibre-Web')
+        parser.add_argument('-r', action='store_true', help='Enable public database reconnect route under /reconnect')
+        args = parser.parse_args()
 
-if os.path.isdir(settings_path):
-    settings_path = os.path.join(settings_path, DEFAULT_SETTINGS_FILE)
+        self.settings_path = args.p or os.path.join(_CONFIG_DIR, DEFAULT_SETTINGS_FILE)
+        self.gd_path = args.g or os.path.join(_CONFIG_DIR, DEFAULT_GDRIVE_FILE)
 
-if os.path.isdir(gd_path):
-    gd_path = os.path.join(gd_path, DEFAULT_GDRIVE_FILE)
+        if os.path.isdir(self.settings_path):
+            self.settings_path = os.path.join(self.settings_path, DEFAULT_SETTINGS_FILE)
+
+        if os.path.isdir(self.gd_path):
+            self.gd_path = os.path.join(self.gd_path, DEFAULT_GDRIVE_FILE)
 
 
-# handle and check parameter for ssl encryption
-certfilepath = None
-keyfilepath = None
-if args.c:
-    if os.path.isfile(args.c):
-        certfilepath = args.c
-    else:
-        print("Certfile path is invalid. Exiting...")
-        sys.exit(1)
-
-if args.c == "":
-    certfilepath = ""
-
-if args.k:
-    if os.path.isfile(args.k):
-        keyfilepath = args.k
-    else:
-        print("Keyfile path is invalid. Exiting...")
-        sys.exit(1)
-
-if (args.k and not args.c) or (not args.k and args.c):
-    print("Certfile and Keyfile have to be used together. Exiting...")
-    sys.exit(1)
-
-if args.k == "":
-    keyfilepath = ""
-
-
-# dry run updater
-dry_run = args.d or None
-# enable reconnect endpoint for docker database reconnect
-reconnect_enable = args.r or os.environ.get("CALIBRE_RECONNECT", None)
-# load covers from localhost
-allow_localhost = args.l or os.environ.get("CALIBRE_LOCALHOST", None)
-# handle and check ip address argument
-ip_address = args.i or None
-
-
-if ip_address:
-    try:
-        # try to parse the given ip address with socket
-        if hasattr(socket, 'inet_pton'):
-            if ':' in ip_address:
-                socket.inet_pton(socket.AF_INET6, ip_address)
+        # handle and check parameter for ssl encryption
+        self.certfilepath = None
+        self.keyfilepath = None
+        if args.c:
+            if os.path.isfile(args.c):
+                self.certfilepath = args.c
             else:
-                socket.inet_pton(socket.AF_INET, ip_address)
-        else:
-            # on windows python < 3.4, inet_pton is not available
-            # inet_atom only handles IPv4 addresses
-            socket.inet_aton(ip_address)
-    except socket.error as err:
-        print(ip_address, ':', err)
-        sys.exit(1)
+                print("Certfile path is invalid. Exiting...")
+                sys.exit(1)
 
-# handle and check user password argument
-user_credentials = args.s or None
-if user_credentials and ":" not in user_credentials:
-    print("No valid 'username:password' format")
-    sys.exit(3)
+        if args.c == "":
+            self.certfilepath = ""
 
-if args.f:
-    print("Warning: -f flag is depreciated and will be removed in next version")
+        if args.k:
+            if os.path.isfile(args.k):
+                self.keyfilepath = args.k
+            else:
+                print("Keyfile path is invalid. Exiting...")
+                sys.exit(1)
 
+        if (args.k and not args.c) or (not args.k and args.c):
+            print("Certfile and Keyfile have to be used together. Exiting...")
+            sys.exit(1)
+
+        if args.k == "":
+            self.keyfilepath = ""
+
+        # dry run updater
+        self.dry_run =args.d or None
+        # enable reconnect endpoint for docker database reconnect
+        self.reconnect_enable = args.r or os.environ.get("CALIBRE_RECONNECT", None)
+        # load covers from localhost
+        self.allow_localhost = args.l or os.environ.get("CALIBRE_LOCALHOST", None)
+        # handle and check ip address argument
+        self.ip_address = args.i or None
+        if self.ip_address:
+            try:
+                # try to parse the given ip address with socket
+                if hasattr(socket, 'inet_pton'):
+                    if ':' in self.ip_address:
+                        socket.inet_pton(socket.AF_INET6, self.ip_address)
+                    else:
+                        socket.inet_pton(socket.AF_INET, self.ip_address)
+                else:
+                    # on windows python < 3.4, inet_pton is not available
+                    # inet_atom only handles IPv4 addresses
+                    socket.inet_aton(self.ip_address)
+            except socket.error as err:
+                print(self.ip_address, ':', err)
+                sys.exit(1)
+
+        # handle and check user password argument
+        self.user_credentials = args.s or None
+        if self.user_credentials and ":" not in self.user_credentials:
+            print("No valid 'username:password' format")
+            sys.exit(3)
+
+        if args.f:
+            print("Warning: -f flag is depreciated and will be removed in next version")
diff --git a/cps/config_sql.py b/cps/config_sql.py
index f4fbb554..e20f7ac2 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -29,7 +29,7 @@ try:
 except ImportError:
     from sqlalchemy.ext.declarative import declarative_base
 
-from . import constants, cli, logger
+from . import constants, logger
 
 
 log = logger.create()
@@ -154,12 +154,16 @@ class _Settings(_Base):
 # Class holds all application specific settings in calibre-web
 class _ConfigSQL(object):
     # pylint: disable=no-member
-    def __init__(self, session):
+    def __init__(self):
+        pass
+
+    def init_config(self, session, cli):
         self._session = session
         self._settings = None
         self.db_configured = None
         self.config_calibre_dir = None
         self.load()
+        self.cli = cli
 
         change = False
         if self.config_converterpath == None:  # pylint: disable=access-member-before-definition
@@ -184,22 +188,21 @@ class _ConfigSQL(object):
         return self._settings
 
     def get_config_certfile(self):
-        if cli.certfilepath:
-            return cli.certfilepath
-        if cli.certfilepath == "":
+        if self.cli.certfilepath:
+            return self.cli.certfilepath
+        if self.cli.certfilepath == "":
             return None
         return self.config_certfile
 
     def get_config_keyfile(self):
-        if cli.keyfilepath:
-            return cli.keyfilepath
-        if cli.certfilepath == "":
+        if self.cli.keyfilepath:
+            return self.cli.keyfilepath
+        if self.cli.certfilepath == "":
             return None
         return self.config_keyfile
 
-    @staticmethod
-    def get_config_ipaddress():
-        return cli.ip_address or ""
+    def get_config_ipaddress(self):
+        return self.cli.ip_address or ""
 
     def _has_role(self, role_flag):
         return constants.has_flag(self.config_default_role, role_flag)
@@ -449,14 +452,15 @@ def _migrate_database(session):
     _migrate_table(session, _Flask_Settings)
 
 
-def load_configuration(session):
+def load_configuration(conf, session, cli):
     _migrate_database(session)
 
     if not session.query(_Settings).count():
         session.add(_Settings())
         session.commit()
-    conf = _ConfigSQL(session)
-    return conf
+    # conf = _ConfigSQL()
+    conf.init_config(session, cli)
+    # return conf
 
 def get_flask_session_key(_session):
     flask_settings = _session.query(_Flask_Settings).one_or_none()
diff --git a/cps/db.py b/cps/db.py
index 9f6440aa..69796c51 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -89,7 +89,7 @@ books_publishers_link = Table('books_publishers_link', Base.metadata,
                               )
 
 
-class LibraryId(Base):
+class Library_Id(Base):
     __tablename__ = 'library_id'
     id = Column(Integer, primary_key=True)
     uuid = Column(String, nullable=False)
@@ -440,10 +440,12 @@ class CalibreDB:
     # instances alive once they reach the end of their respective scopes
     instances = WeakSet()
 
-    def __init__(self, expire_on_commit=True):
+    def __init__(self):
         """ Initialize a new CalibreDB session
         """
         self.session = None
+
+    def init_db(self, expire_on_commit=True):
         if self._init:
             self.init_session(expire_on_commit)
 
@@ -543,7 +545,7 @@ class CalibreDB:
                 connection.execute(text("attach database '{}' as app_settings;".format(app_db_path)))
                 local_session = scoped_session(sessionmaker())
                 local_session.configure(bind=connection)
-                database_uuid = local_session().query(LibraryId).one_or_none()
+                database_uuid = local_session().query(Library_Id).one_or_none()
                 # local_session.dispose()
 
             check_engine.connect()
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 768f1830..9ac1557b 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -49,7 +49,7 @@ from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import change_archived_books
 
 
-EditBook = Blueprint('edit-book', __name__)
+editbook = Blueprint('edit-book', __name__)
 log = logger.create()
 
 
@@ -228,14 +228,14 @@ def modify_identifiers(input_identifiers, db_identifiers, db_session):
     return changed, error
 
 
-@EditBook.route("/ajax/delete/<int:book_id>", methods=["POST"])
+@editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
     return Response(delete_book_from_table(book_id, "", True), mimetype='application/json')
 
 
-@EditBook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
-@EditBook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
+@editbook.route("/delete/<int:book_id>", defaults={'book_format': ""}, methods=["POST"])
+@editbook.route("/delete/<int:book_id>/<string:book_format>", methods=["POST"])
 @login_required
 def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
@@ -743,14 +743,14 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     return input_authors, change, renamed
 
 
-@EditBook.route("/admin/book/<int:book_id>", methods=['GET'])
+@editbook.route("/admin/book/<int:book_id>", methods=['GET'])
 @login_required_if_no_ano
 @edit_required
 def show_edit_book(book_id):
     return render_edit_book(book_id)
 
 
-@EditBook.route("/admin/book/<int:book_id>", methods=['POST'])
+@editbook.route("/admin/book/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_book(book_id):
@@ -1084,7 +1084,7 @@ def move_coverfile(meta, db_book):
               category="error")
 
 
-@EditBook.route("/upload", methods=["POST"])
+@editbook.route("/upload", methods=["POST"])
 @login_required_if_no_ano
 @upload_required
 def upload():
@@ -1153,7 +1153,7 @@ def upload():
         return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
 
 
-@EditBook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
+@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def convert_bookformat(book_id):
@@ -1178,7 +1178,7 @@ def convert_bookformat(book_id):
     return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
 
 
-@EditBook.route("/ajax/getcustomenum/<int:c_id>")
+@editbook.route("/ajax/getcustomenum/<int:c_id>")
 @login_required
 def table_get_custom_enum(c_id):
     ret = list()
@@ -1191,7 +1191,7 @@ def table_get_custom_enum(c_id):
     return json.dumps(ret)
 
 
-@EditBook.route("/ajax/editbooks/<param>", methods=['POST'])
+@editbook.route("/ajax/editbooks/<param>", methods=['POST'])
 @login_required_if_no_ano
 @edit_required
 def edit_list_book(param):
@@ -1303,7 +1303,7 @@ def edit_list_book(param):
     return ret
 
 
-@EditBook.route("/ajax/sort_value/<field>/<int:bookid>")
+@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
 @login_required
 def get_sorted_entry(field, bookid):
     if field in ['title', 'authors', 'sort', 'author_sort']:
@@ -1320,7 +1320,7 @@ def get_sorted_entry(field, bookid):
     return ""
 
 
-@EditBook.route("/ajax/simulatemerge", methods=['POST'])
+@editbook.route("/ajax/simulatemerge", methods=['POST'])
 @login_required
 @edit_required
 def simulate_merge_list_book():
@@ -1336,7 +1336,7 @@ def simulate_merge_list_book():
     return ""
 
 
-@EditBook.route("/ajax/mergebooks", methods=['POST'])
+@editbook.route("/ajax/mergebooks", methods=['POST'])
 @login_required
 @edit_required
 def merge_list_book():
@@ -1374,7 +1374,7 @@ def merge_list_book():
     return ""
 
 
-@EditBook.route("/ajax/xchange", methods=['POST'])
+@editbook.route("/ajax/xchange", methods=['POST'])
 @login_required
 @edit_required
 def table_xchange_author_title():
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index ee8ee953..9990e3db 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -63,7 +63,7 @@ except ImportError as err:
         importError = err
         gdrive_support = False
 
-from . import logger, cli, config
+from . import logger, cli_param, config
 from .constants import CONFIG_DIR as _CONFIG_DIR
 
 
@@ -142,7 +142,7 @@ def is_gdrive_ready():
     return os.path.exists(SETTINGS_YAML) and os.path.exists(CREDENTIALS)
 
 
-engine = create_engine('sqlite:///{0}'.format(cli.gd_path), echo=False)
+engine = create_engine('sqlite:///{0}'.format(cli_param.gd_path), echo=False)
 Base = declarative_base()
 
 # Open session for database connection
@@ -190,11 +190,11 @@ def migrate():
                 session.execute('ALTER TABLE gdrive_ids2 RENAME to gdrive_ids')
             break
 
-if not os.path.exists(cli.gd_path):
+if not os.path.exists(cli_param.gd_path):
     try:
         Base.metadata.create_all(engine)
     except Exception as ex:
-        log.error("Error connect to database: {} - {}".format(cli.gd_path, ex))
+        log.error("Error connect to database: {} - {}".format(cli_param.gd_path, ex))
         raise
 migrate()
 
@@ -544,6 +544,7 @@ def deleteDatabaseOnChange():
     except (OperationalError, InvalidRequestError) as ex:
         session.rollback()
         log.error_or_exception('Database error: {}'.format(ex))
+        session.rollback()
 
 
 def updateGdriveCalibreFromLocal():
diff --git a/cps/main.py b/cps/main.py
new file mode 100644
index 00000000..b960028e
--- /dev/null
+++ b/cps/main.py
@@ -0,0 +1,71 @@
+# -*- coding: utf-8 -*-
+
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2012-2022 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  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 sys
+
+from . import create_app
+from .jinjia import jinjia
+from .shelf import shelf
+from .remotelogin import remotelogin
+from .search_metadata import meta
+from .error_handler import init_errorhandler
+
+try:
+    from kobo import kobo, get_kobo_activated
+    from kobo_auth import kobo_auth
+    kobo_available = get_kobo_activated()
+except (ImportError, AttributeError):   # Catch also error for not installed flask-WTF (missing csrf decorator)
+    kobo_available = False
+
+try:
+    from oauth_bb import oauth
+    oauth_available = True
+except ImportError:
+    oauth_available = False
+
+
+def main():
+    app = create_app()
+
+    from .web import web
+    from .opds import opds
+    from .admin import admi
+    from .gdrive import gdrive
+    from .editbooks import editbook
+    from .about import about
+
+    from . import web_server
+    init_errorhandler()
+
+    app.register_blueprint(web)
+    app.register_blueprint(opds)
+    app.register_blueprint(jinjia)
+    app.register_blueprint(about)
+    app.register_blueprint(shelf)
+    app.register_blueprint(admi)  #
+    app.register_blueprint(remotelogin)
+    app.register_blueprint(meta)
+    app.register_blueprint(gdrive)
+    app.register_blueprint(editbook)
+    if kobo_available:
+        app.register_blueprint(kobo)
+        app.register_blueprint(kobo_auth)
+    if oauth_available:
+        app.register_blueprint(oauth)
+    success = web_server.start()
+    sys.exit(0 if success else 1)
diff --git a/cps/tasks/mail.py b/cps/tasks/mail.py
index ad38a400..be240c79 100755
--- a/cps/tasks/mail.py
+++ b/cps/tasks/mail.py
@@ -24,11 +24,10 @@ import mimetypes
 
 from io import StringIO
 from email.message import EmailMessage
-from email.utils import parseaddr
-
+from email.utils import formatdate, parseaddr
+from email.generator import Generator
 from flask_babel import lazy_gettext as N_
 from email.utils import formatdate
-from email.generator import Generator
 
 from cps.services.worker import CalibreTask
 from cps.services import gmail
diff --git a/cps/templates/admin.html b/cps/templates/admin.html
index 8a20b73e..f1c3749a 100644
--- a/cps/templates/admin.html
+++ b/cps/templates/admin.html
@@ -210,7 +210,7 @@
 
   <div class="row">
     <div class="col">
-      <h2>{{_('Update')}}</h2>
+      <h2>{{_('Version Information')}}</h2>
       <table class="table table-striped" id="update_table">
         <thead>
           <tr>
diff --git a/cps/ub.py b/cps/ub.py
index 0360b572..fdeff2bc 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -53,7 +53,7 @@ except ImportError:
 from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import constants, logger, cli
+from . import constants, logger
 
 log = logger.create()
 
@@ -816,7 +816,7 @@ def init_db_thread():
     return Session()
 
 
-def init_db(app_db_path):
+def init_db(app_db_path, user_credentials=None):
     # Open session for database connection
     global session
     global app_DB_path
@@ -837,8 +837,8 @@ def init_db(app_db_path):
         create_admin_user(session)
         create_anonymous_user(session)
 
-    if cli.user_credentials:
-        username, password = cli.user_credentials.split(':', 1)
+    if user_credentials:
+        username, password = user_credentials.split(':', 1)
         user = session.query(User).filter(func.lower(User.name) == username.lower()).first()
         if user:
             if not password:
diff --git a/cps/updater.py b/cps/updater.py
index 021df005..f651719e 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -31,7 +31,7 @@ import requests
 from babel.dates import format_datetime
 from flask_babel import gettext as _
 
-from . import constants, logger, config, web_server
+from . import constants, logger  #  config, web_server
 
 
 log = logger.create()
@@ -58,13 +58,17 @@ class Updater(threading.Thread):
         self.status = -1
         self.updateIndex = None
 
+    def init_updater(self, config, web_server):
+        self.config = config
+        self.web_server = web_server
+
     def get_current_version_info(self):
-        if config.config_updatechannel == constants.UPDATE_STABLE:
+        if self.config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_version_info()
         return self._nightly_version_info()
 
     def get_available_updates(self, request_method, locale):
-        if config.config_updatechannel == constants.UPDATE_STABLE:
+        if self.config.config_updatechannel == constants.UPDATE_STABLE:
             return self._stable_available_updates(request_method)
         return self._nightly_available_updates(request_method, locale)
 
@@ -95,7 +99,7 @@ class Updater(threading.Thread):
                 self.status = 6
                 log.debug(u'Preparing restart of server')
                 time.sleep(2)
-                web_server.stop(True)
+                self.web_server.stop(True)
                 self.status = 7
                 time.sleep(2)
                 return True
diff --git a/setup.cfg b/setup.cfg
index 5e427849..9daae0c9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -54,7 +54,7 @@ install_requires =
 	tornado>=4.1,<6.2
 	Wand>=0.4.4,<0.7.0
 	unidecode>=0.04.19,<1.4.0
-	lxml>=3.8.0,<4.8.0
+	lxml>=3.8.0,<4.9.0
 	flask-wtf>=0.14.2,<1.1.0
 	chardet>=3.0.0,<4.1.0
 	advocate>=1.0.0,<1.1.0
@@ -62,7 +62,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.44.0
+	google-api-python-client>=1.7.11,<2.46.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -75,7 +75,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.44.0
+	google-api-python-client>=1.7.11,<2.46.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From e7464f26948bc6695b99de5420fc035e5ba6b12b Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 11:28:20 +0200
Subject: [PATCH 212/220] Refactored web.py to shrink size of file

---
 cps/__init__.py                |  85 ++-----
 cps/about.py                   |   2 +-
 cps/admin.py                   |  22 +-
 cps/babel.py                   |  30 +++
 cps/db.py                      |   2 +-
 cps/editbooks.py               |   3 +-
 cps/error_handler.py           |   1 +
 cps/gdriveutils.py             |   5 -
 cps/helper.py                  |  64 +----
 cps/isoLanguages.py            |   2 +-
 cps/main.py                    |   6 +-
 cps/oauth.py                   |  14 +-
 cps/opds.py                    |   5 +-
 cps/redirect.py                |   1 -
 cps/render_template.py         |   3 +-
 cps/search.py                  | 422 +++++++++++++++++++++++++++++++++
 cps/search_metadata.py         |   6 +-
 cps/tasks/convert.py           |   6 +-
 cps/tasks/thumbnail.py         |   9 +-
 cps/tasks_status.py            |  95 ++++++++
 cps/templates/layout.html      |   6 +-
 cps/templates/search_form.html |   2 +-
 cps/templates/tasks.html       |   2 +-
 cps/ub.py                      |   2 +-
 cps/updater.py                 |   2 +-
 cps/uploader.py                |  27 +--
 cps/web.py                     | 396 ++-----------------------------
 27 files changed, 639 insertions(+), 581 deletions(-)
 create mode 100644 cps/babel.py
 create mode 100644 cps/search.py
 create mode 100644 cps/tasks_status.py

diff --git a/cps/__init__.py b/cps/__init__.py
index 269599ad..0a452b17 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -23,32 +23,22 @@ import sys
 import os
 import mimetypes
 
-from babel import Locale as LC
-from babel import negotiate_locale
-from babel.core import UnknownLocaleError
-from flask import request, g
 from flask import Flask
 from .MyLoginManager import MyLoginManager
-from flask_babel import Babel
 from flask_principal import Principal
 
-from . import config_sql
-from . import logger
-from . import cache_buster
 from .cli import CliParameter
 from .constants import CONFIG_DIR
-from . import ub, db
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
 from . import services
 from .updater import Updater
-
-try:
-    import lxml
-    lxml_present = True
-except ImportError:
-    lxml_present = False
+from .babel import babel, BABEL_TRANSLATIONS
+from . import config_sql
+from . import logger
+from . import cache_buster
+from . import ub, db
 
 try:
     from flask_wtf.csrf import CSRFProtect
@@ -78,6 +68,8 @@ mimetypes.add_type('application/ogg', '.oga')
 mimetypes.add_type('text/css', '.css')
 mimetypes.add_type('text/javascript; charset=UTF-8', '.js')
 
+log = logger.create()
+
 app = Flask(__name__)
 app.config.update(
     SESSION_COOKIE_HTTPONLY=True,
@@ -86,14 +78,8 @@ app.config.update(
     WTF_CSRF_SSL_STRICT=False
 )
 
-
 lm = MyLoginManager()
 
-babel = Babel()
-_BABEL_TRANSLATIONS = set()
-
-log = logger.create()
-
 config = config_sql._ConfigSQL()
 
 cli_param = CliParameter()
@@ -120,9 +106,8 @@ def create_app():
 
     cli_param.init()
 
-    ub.init_db(os.path.join(CONFIG_DIR, "app.db"), cli_param.user_credentials)
+    ub.init_db(cli_param.settings_path, cli_param.user_credentials)
 
-    # ub.init_db(os.path.join(CONFIG_DIR, "app.db"))
     # pylint: disable=no-member
     config_sql.load_configuration(config, ub.session, cli_param)
 
@@ -139,26 +124,26 @@ def create_app():
 
     if sys.version_info < (3, 0):
         log.info(
-            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, please update your installation to Python3 ***')
+            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, '
+            'please update your installation to Python3 ***')
         print(
-            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, please update your installation to Python3 ***')
+            '*** Python2 is EOL since end of 2019, this version of Calibre-Web is no longer supporting Python2, '
+            'please update your installation to Python3 ***')
         web_server.stop(True)
         sys.exit(5)
-    if not lxml_present:
-        log.info('*** "lxml" is needed for calibre-web to run. Please install it using pip: "pip install lxml" ***')
-        print('*** "lxml" is needed for calibre-web to run. Please install it using pip: "pip install lxml" ***')
-        web_server.stop(True)
-        sys.exit(6)
     if not wtf_present:
-        log.info('*** "flask-WTF" is needed for calibre-web to run. Please install it using pip: "pip install flask-WTF" ***')
-        print('*** "flask-WTF" is needed for calibre-web to run. Please install it using pip: "pip install flask-WTF" ***')
+        log.info('*** "flask-WTF" is needed for calibre-web to run. '
+                 'Please install it using pip: "pip install flask-WTF" ***')
+        print('*** "flask-WTF" is needed for calibre-web to run. '
+              'Please install it using pip: "pip install flask-WTF" ***')
         web_server.stop(True)
         sys.exit(7)
     for res in dependency_check() + dependency_check(True):
-        log.info('*** "{}" version does not fit the requirements. Should: {}, Found: {}, please consider installing required version ***'
-            .format(res['name'],
-                 res['target'],
-                 res['found']))
+        log.info('*** "{}" version does not fit the requirements. '
+                 'Should: {}, Found: {}, please consider installing required version ***'
+                 .format(res['name'],
+                         res['target'],
+                         res['found']))
     app.wsgi_app = ReverseProxied(app.wsgi_app)
 
     if os.environ.get('FLASK_DEBUG'):
@@ -172,8 +157,8 @@ def create_app():
     web_server.init_app(app, config)
 
     babel.init_app(app)
-    _BABEL_TRANSLATIONS.update(str(item) for item in babel.list_translations())
-    _BABEL_TRANSLATIONS.add('en')
+    BABEL_TRANSLATIONS.update(str(item) for item in babel.list_translations())
+    BABEL_TRANSLATIONS.add('en')
 
     if services.ldap:
         services.ldap.init_app(app, config)
@@ -185,27 +170,3 @@ def create_app():
     return app
 
 
-@babel.localeselector
-def get_locale():
-    # if a user is logged in, use the locale from the user settings
-    user = getattr(g, 'user', None)
-    if user is not None and hasattr(user, "locale"):
-        if user.name != 'Guest':   # if the account is the guest account bypass the config lang settings
-            return user.locale
-
-    preferred = list()
-    if request.accept_languages:
-        for x in request.accept_languages.values():
-            try:
-                preferred.append(str(LC.parse(x.replace('-', '_'))))
-            except (UnknownLocaleError, ValueError) as e:
-                log.debug('Could not parse locale "%s": %s', x, e)
-
-    return negotiate_locale(preferred or ['en'], _BABEL_TRANSLATIONS)
-
-
-'''@babel.timezoneselector
-def get_timezone():
-    user = getattr(g, 'user', None)
-    return user.timezone if user else None'''
-
diff --git a/cps/about.py b/cps/about.py
index 92dc41aa..1b68818d 100644
--- a/cps/about.py
+++ b/cps/about.py
@@ -65,7 +65,7 @@ _VERSIONS = OrderedDict(
     SQLite=sqlite3.sqlite_version,
 )
 _VERSIONS.update(ret)
-_VERSIONS.update(uploader.get_versions(False))
+_VERSIONS.update(uploader.get_versions())
 
 
 def collect_stats():
diff --git a/cps/admin.py b/cps/admin.py
index 46da062e..29f2319e 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -28,11 +28,10 @@ import operator
 from datetime import datetime, timedelta, time
 from functools import wraps
 
-from babel import Locale
-from babel.dates import format_datetime, format_time, format_timedelta
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
+from flask_babel import get_locale,  format_time, format_datetime, format_timedelta
 from flask import session as flask_session
 from sqlalchemy import and_
 from sqlalchemy.orm.attributes import flag_modified
@@ -40,14 +39,14 @@ from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
 from . import constants, logger, helper, services, cli
-from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils, \
+from . import db, calibre_db, ub, web_server, config, updater_thread, babel, gdriveutils, \
     kobo_sync_status, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username, update_thumbnail_cache
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from .services.worker import WorkerThread
-from . import debug_info, _BABEL_TRANSLATIONS
+from . import debug_info, BABEL_TRANSLATIONS
 
 
 log = logger.create()
@@ -205,9 +204,9 @@ def admin():
 
     all_user = ub.session.query(ub.User).all()
     email_settings = config.get_mail_settings()
-    schedule_time = format_time(time(hour=config.schedule_start_time), format="short", locale=locale)
+    schedule_time = format_time(time(hour=config.schedule_start_time), format="short")
     t = timedelta(hours=config.schedule_duration // 60, minutes=config.schedule_duration % 60)
-    schedule_duration = format_timedelta(t, format="short", threshold=.99, locale=locale)
+    schedule_duration = format_timedelta(t, threshold=.99)
 
     return render_title_template("admin.html", allUser=all_user, email=email_settings, config=config, commit=commit,
                                  feature_support=feature_support, schedule_time=schedule_time,
@@ -279,7 +278,7 @@ def view_configuration():
 def edit_user_table():
     visibility = current_user.view_settings.get('useredit', {})
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [Locale('en')]
+    translations = [LC('en')] + babel.list_translations()
     all_user = ub.session.query(ub.User)
     tags = calibre_db.session.query(db.Tags)\
         .join(db.books_tags_link)\
@@ -398,7 +397,7 @@ def delete_user():
 @login_required
 @admin_required
 def table_get_locale():
-    locale = babel.list_translations() + [Locale('en')]
+    locale = [LC('en')] + babel.list_translations()
     ret = list()
     current_locale = get_locale()
     for loc in locale:
@@ -499,7 +498,7 @@ def edit_list_user(param):
                 elif param == 'locale':
                     if user.name == "Guest":
                         raise Exception(_("Guest's Locale is determined automatically and can't be set"))
-                    if vals['value'] in _BABEL_TRANSLATIONS:
+                    if vals['value'] in BABEL_TRANSLATIONS:
                         user.locale = vals['value']
                     else:
                         raise Exception(_("No Valid Locale Given"))
@@ -1668,12 +1667,11 @@ def edit_scheduledtasks():
     time_field = list()
     duration_field = list()
 
-    locale = get_locale()
     for n in range(24):
-        time_field.append((n , format_time(time(hour=n), format="short", locale=locale)))
+        time_field.append((n , format_time(time(hour=n), format="short",)))
     for n in range(5, 65, 5):
         t = timedelta(hours=n // 60, minutes=n % 60)
-        duration_field.append((n, format_timedelta(t, format="short", threshold=.99, locale=locale)))
+        duration_field.append((n, format_timedelta(t, threshold=.9)))
 
     return render_title_template("schedule_edit.html", config=content, starttime=time_field, duration=duration_field, title=_(u"Edit Scheduled Tasks Settings"))
 
diff --git a/cps/babel.py b/cps/babel.py
new file mode 100644
index 00000000..b0d5c238
--- /dev/null
+++ b/cps/babel.py
@@ -0,0 +1,30 @@
+from babel import Locale as LC
+from babel import negotiate_locale
+from flask_babel import Babel
+from babel.core import UnknownLocaleError
+from flask import request, g
+
+from . import logger
+
+log = logger.create()
+
+babel = Babel()
+BABEL_TRANSLATIONS = set()
+
+@babel.localeselector
+def get_locale():
+    # if a user is logged in, use the locale from the user settings
+    user = getattr(g, 'user', None)
+    if user is not None and hasattr(user, "locale"):
+        if user.name != 'Guest':   # if the account is the guest account bypass the config lang settings
+            return user.locale
+
+    preferred = list()
+    if request.accept_languages:
+        for x in request.accept_languages.values():
+            try:
+                preferred.append(str(LC.parse(x.replace('-', '_'))))
+            except (UnknownLocaleError, ValueError) as e:
+                log.debug('Could not parse locale "%s": %s', x, e)
+
+    return negotiate_locale(preferred or ['en'], BABEL_TRANSLATIONS)
diff --git a/cps/db.py b/cps/db.py
index 69796c51..f28baeca 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -43,6 +43,7 @@ from sqlalchemy.sql.expression import and_, true, false, text, func, or_
 from sqlalchemy.ext.associationproxy import association_proxy
 from flask_login import current_user
 from flask_babel import gettext as _
+from flask_babel import get_locale
 from flask import flash
 
 from . import logger, ub, isoLanguages
@@ -898,7 +899,6 @@ class CalibreDB:
 
     # Creates for all stored languages a translated speaking name in the array for the UI
     def speaking_language(self, languages=None, return_all_languages=False, with_count=False, reverse_order=False):
-        from . import get_locale
 
         if with_count:
             if not languages:
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 9ac1557b..3ac3dfb8 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -36,11 +36,12 @@ except ImportError:
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
+from flask_babel import get_locale
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
 # from sqlite3 import OperationalError as sqliteOperationalError
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
-from . import config, get_locale, ub, db
+from . import config, ub, db
 from . import calibre_db
 from .services.worker import WorkerThread
 from .tasks.upload import TaskUpload
diff --git a/cps/error_handler.py b/cps/error_handler.py
index 67252a66..7c003bdb 100644
--- a/cps/error_handler.py
+++ b/cps/error_handler.py
@@ -17,6 +17,7 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import traceback
+
 from flask import render_template
 from werkzeug.exceptions import default_exceptions
 try:
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 9990e3db..e2e0a536 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -680,8 +680,3 @@ def get_error_text(client_secrets=None):
         return 'Callback url (redirect url) is missing in client_secrets.json'
     if client_secrets:
         client_secrets.update(filedata['web'])
-
-
-def get_versions():
-    return { # 'six': six_version,
-            'httplib2': httplib2_version}
diff --git a/cps/helper.py b/cps/helper.py
index d97d6475..aec14668 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -29,11 +29,11 @@ from tempfile import gettempdir
 import requests
 import unidecode
 
-from babel.dates import format_datetime
-from babel.units import format_unit
+
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
+from flask_babel import format_datetime, get_locale
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -54,7 +54,7 @@ except ImportError:
 
 from . import calibre_db, cli
 from .tasks.convert import TaskConvert
-from . import logger, config, get_locale, db, ub, fs
+from . import logger, config, db, ub, fs
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
@@ -970,64 +970,6 @@ def json_serial(obj):
     raise TypeError("Type %s not serializable" % type(obj))
 
 
-# helper function for displaying the runtime of tasks
-def format_runtime(runtime):
-    ret_val = ""
-    if runtime.days:
-        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
-    mins, seconds = divmod(runtime.seconds, 60)
-    hours, minutes = divmod(mins, 60)
-    # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
-    if hours:
-        ret_val += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
-    elif minutes:
-        ret_val += '{:2d}:{:02d}s'.format(minutes, seconds)
-    else:
-        ret_val += '{:2d}s'.format(seconds)
-    return ret_val
-
-
-# helper function to apply localize status information in tasklist entries
-def render_task_status(tasklist):
-    renderedtasklist = list()
-    for __, user, __, task, __ in tasklist:
-        if user == current_user.name or current_user.role_admin():
-            ret = {}
-            if task.start_time:
-                ret['starttime'] = format_datetime(task.start_time, format='short', locale=get_locale())
-                ret['runtime'] = format_runtime(task.runtime)
-
-            # localize the task status
-            if isinstance(task.stat, int):
-                if task.stat == STAT_WAITING:
-                    ret['status'] = _(u'Waiting')
-                elif task.stat == STAT_FAIL:
-                    ret['status'] = _(u'Failed')
-                elif task.stat == STAT_STARTED:
-                    ret['status'] = _(u'Started')
-                elif task.stat == STAT_FINISH_SUCCESS:
-                    ret['status'] = _(u'Finished')
-                elif task.stat == STAT_ENDED:
-                    ret['status'] = _(u'Ended')
-                elif task.stat == STAT_CANCELLED:
-                    ret['status'] = _(u'Cancelled')
-                else:
-                    ret['status'] = _(u'Unknown Status')
-
-            ret['taskMessage'] = "{}: {}".format(task.name, task.message) if task.message else task.name
-            ret['progress'] = "{} %".format(int(task.progress * 100))
-            ret['user'] = escape(user)  # prevent xss
-
-            # Hidden fields
-            ret['task_id'] = task.id
-            ret['stat'] = task.stat
-            ret['is_cancellable'] = task.is_cancellable
-
-            renderedtasklist.append(ret)
-
-    return renderedtasklist
-
-
 def tags_filters():
     negtags_list = current_user.list_denied_tags()
     postags_list = current_user.list_allowed_tags()
diff --git a/cps/isoLanguages.py b/cps/isoLanguages.py
index 50447aca..31e3dade 100644
--- a/cps/isoLanguages.py
+++ b/cps/isoLanguages.py
@@ -49,7 +49,7 @@ except ImportError:
 
 
 def get_language_names(locale):
-    return _LANGUAGE_NAMES.get(locale)
+    return _LANGUAGE_NAMES.get(str(locale))
 
 
 def get_language_name(locale, lang_code):
diff --git a/cps/main.py b/cps/main.py
index b960028e..304a244a 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -24,6 +24,7 @@ from .shelf import shelf
 from .remotelogin import remotelogin
 from .search_metadata import meta
 from .error_handler import init_errorhandler
+from .tasks_status import tasks
 
 try:
     from kobo import kobo, get_kobo_activated
@@ -48,16 +49,19 @@ def main():
     from .gdrive import gdrive
     from .editbooks import editbook
     from .about import about
+    from .search import search
 
     from . import web_server
     init_errorhandler()
 
+    app.register_blueprint(search)
+    app.register_blueprint(tasks)
     app.register_blueprint(web)
     app.register_blueprint(opds)
     app.register_blueprint(jinjia)
     app.register_blueprint(about)
     app.register_blueprint(shelf)
-    app.register_blueprint(admi)  #
+    app.register_blueprint(admi)
     app.register_blueprint(remotelogin)
     app.register_blueprint(meta)
     app.register_blueprint(gdrive)
diff --git a/cps/oauth.py b/cps/oauth.py
index f8e5c1fd..0caa61ec 100644
--- a/cps/oauth.py
+++ b/cps/oauth.py
@@ -19,18 +19,12 @@
 from flask import session
 
 try:
-    from flask_dance.consumer.backend.sqla import SQLAlchemyBackend, first, _get_real_user
+    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 = False       # prevent storing values with this resultcode
+    backend_resultcode = True  # prevent storing values with this resultcode
 except ImportError:
-    # fails on flask-dance >1.3, due to renaming
-    try:
-        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
-    except ImportError:
-        pass
+    pass
 
 
 class OAuthBackend(SQLAlchemyBackend):
diff --git a/cps/opds.py b/cps/opds.py
index cb8f397e..2b8ab6d6 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -26,15 +26,18 @@ from functools import wraps
 
 from flask import Blueprint, request, render_template, Response, g, make_response, abort
 from flask_login import current_user
+from flask_babel import get_locale
 from sqlalchemy.sql.expression import func, text, or_, and_, true
 from sqlalchemy.exc import InvalidRequestError, OperationalError
 from werkzeug.security import check_password_hash
-from . import constants, logger, config, db, calibre_db, ub, services, get_locale, isoLanguages
+
+from . import constants, logger, config, db, calibre_db, ub, services, isoLanguages
 from .helper import get_download_link, get_book_cover
 from .pagination import Pagination
 from .web import render_read_books
 from .usermanagement import load_user_from_request
 from flask_babel import gettext as _
+
 opds = Blueprint('opds', __name__)
 
 log = logger.create()
diff --git a/cps/redirect.py b/cps/redirect.py
index 8bd68109..9382a205 100644
--- a/cps/redirect.py
+++ b/cps/redirect.py
@@ -29,7 +29,6 @@
 
 from urllib.parse import urlparse, urljoin
 
-
 from flask import request, url_for, redirect
 
 
diff --git a/cps/render_template.py b/cps/render_template.py
index d2f40d6c..0750a9c4 100644
--- a/cps/render_template.py
+++ b/cps/render_template.py
@@ -16,9 +16,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from flask import render_template, request
+from flask import render_template, g, abort, request
 from flask_babel import gettext as _
-from flask import g, abort
 from werkzeug.local import LocalProxy
 from flask_login import current_user
 
diff --git a/cps/search.py b/cps/search.py
new file mode 100644
index 00000000..429aea17
--- /dev/null
+++ b/cps/search.py
@@ -0,0 +1,422 @@
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  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 json
+from datetime import datetime
+
+from flask import Blueprint, request, redirect, url_for, flash
+from flask import session as flask_session
+from flask_login import current_user
+from flask_babel import get_locale, format_date
+from flask_babel import gettext as _
+from sqlalchemy.sql.expression import func, not_, and_, or_, text
+from sqlalchemy.sql.functions import coalesce
+
+from . import logger, db, calibre_db, config, ub
+from .usermanagement import login_required_if_no_ano
+from .render_template import render_title_template
+from .pagination import Pagination
+
+search = Blueprint('search', __name__)
+
+log = logger.create()
+
+
+@search.route("/search", methods=["GET"])
+@login_required_if_no_ano
+def simple_search():
+    term = request.args.get("query")
+    if term:
+        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term.strip()))
+    else:
+        return render_title_template('search.html',
+                                     searchterm="",
+                                     result_count=0,
+                                     title=_(u"Search"),
+                                     page="search")
+
+
+@search.route("/advsearch", methods=['POST'])
+@login_required_if_no_ano
+def advanced_search():
+    values = dict(request.form)
+    params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_shelf', 'exclude_shelf',
+              'include_language', 'exclude_language', 'include_extension', 'exclude_extension']
+    for param in params:
+        values[param] = list(request.form.getlist(param))
+    flask_session['query'] = json.dumps(values)
+    return redirect(url_for('web.books_list', data="advsearch", sort_param='stored', query=""))
+
+
+@search.route("/advsearch", methods=['GET'])
+@login_required_if_no_ano
+def advanced_search_form():
+    # Build custom columns names
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    return render_prepare_search_form(cc)
+
+
+def adv_search_custom_columns(cc, term, q):
+    for c in cc:
+        if c.datatype == "datetime":
+            custom_start = term.get('custom_column_' + str(c.id) + '_start')
+            custom_end = term.get('custom_column_' + str(c.id) + '_end')
+            if custom_start:
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    func.datetime(db.cc_classes[c.id].value) >= func.datetime(custom_start)))
+            if custom_end:
+                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                    func.datetime(db.cc_classes[c.id].value) <= func.datetime(custom_end)))
+        else:
+            custom_query = term.get('custom_column_' + str(c.id))
+            if custom_query != '' and custom_query is not None:
+                if c.datatype == 'bool':
+                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                        db.cc_classes[c.id].value == (custom_query == "True")))
+                elif c.datatype == 'int' or c.datatype == 'float':
+                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                        db.cc_classes[c.id].value == custom_query))
+                elif c.datatype == 'rating':
+                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                        db.cc_classes[c.id].value == int(float(custom_query) * 2)))
+                else:
+                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
+                        func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%")))
+    return q
+
+
+def adv_search_language(q, include_languages_inputs, exclude_languages_inputs):
+    if current_user.filter_language() != "all":
+        q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
+    else:
+        for language in include_languages_inputs:
+            q = q.filter(db.Books.languages.any(db.Languages.id == language))
+        for language in exclude_languages_inputs:
+            q = q.filter(not_(db.Books.series.any(db.Languages.id == language)))
+    return q
+
+
+def adv_search_ratings(q, rating_high, rating_low):
+    if rating_high:
+        rating_high = int(rating_high) * 2
+        q = q.filter(db.Books.ratings.any(db.Ratings.rating <= rating_high))
+    if rating_low:
+        rating_low = int(rating_low) * 2
+        q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low))
+    return q
+
+
+def adv_search_read_status(q, read_status):
+    if read_status:
+        if config.config_read_column:
+            try:
+                if read_status == "True":
+                    q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
+                        .filter(db.cc_classes[config.config_read_column].value == True)
+                else:
+                    q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
+                        .filter(coalesce(db.cc_classes[config.config_read_column].value, False) != True)
+            except (KeyError, AttributeError):
+                log.error(u"Custom Column No.%d is not existing in calibre database", config.config_read_column)
+                flash(_("Custom Column No.%(column)d is not existing in calibre database",
+                        column=config.config_read_column),
+                      category="error")
+                return q
+        else:
+            if read_status == "True":
+                q = q.join(ub.ReadBook, db.Books.id == ub.ReadBook.book_id, isouter=True) \
+                    .filter(ub.ReadBook.user_id == int(current_user.id),
+                            ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED)
+            else:
+                q = q.join(ub.ReadBook, db.Books.id == ub.ReadBook.book_id, isouter=True) \
+                    .filter(ub.ReadBook.user_id == int(current_user.id),
+                            coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED)
+    return q
+
+
+def adv_search_extension(q, include_extension_inputs, exclude_extension_inputs):
+    for extension in include_extension_inputs:
+        q = q.filter(db.Books.data.any(db.Data.format == extension))
+    for extension in exclude_extension_inputs:
+        q = q.filter(not_(db.Books.data.any(db.Data.format == extension)))
+    return q
+
+
+def adv_search_tag(q, include_tag_inputs, exclude_tag_inputs):
+    for tag in include_tag_inputs:
+        q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+    for tag in exclude_tag_inputs:
+        q = q.filter(not_(db.Books.tags.any(db.Tags.id == tag)))
+    return q
+
+
+def adv_search_serie(q, include_series_inputs, exclude_series_inputs):
+    for serie in include_series_inputs:
+        q = q.filter(db.Books.series.any(db.Series.id == serie))
+    for serie in exclude_series_inputs:
+        q = q.filter(not_(db.Books.series.any(db.Series.id == serie)))
+    return q
+
+def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
+    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id)\
+        .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
+    if len(include_shelf_inputs) > 0:
+        q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
+    return q
+
+def extend_search_term(searchterm,
+                       author_name,
+                       book_title,
+                       publisher,
+                       pub_start,
+                       pub_end,
+                       tags,
+                       rating_high,
+                       rating_low,
+                       read_status,
+                       ):
+    searchterm.extend((author_name.replace('|', ','), book_title, publisher))
+    if pub_start:
+        try:
+            searchterm.extend([_(u"Published after ") +
+                               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.strptime(pub_end, "%Y-%m-%d"),
+                                           format='medium', locale=get_locale())])
+        except ValueError:
+            pub_end = u""
+    elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
+    for key, db_element in elements.items():
+        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
+        searchterm.extend(tag.name for tag in tag_names)
+        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['exclude_' + key])).all()
+        searchterm.extend(tag.name for tag in tag_names)
+    language_names = calibre_db.session.query(db.Languages). \
+        filter(db.Languages.id.in_(tags['include_language'])).all()
+    if language_names:
+        language_names = calibre_db.speaking_language(language_names)
+    searchterm.extend(language.name for language in language_names)
+    language_names = calibre_db.session.query(db.Languages). \
+        filter(db.Languages.id.in_(tags['exclude_language'])).all()
+    if language_names:
+        language_names = calibre_db.speaking_language(language_names)
+    searchterm.extend(language.name for language in language_names)
+    if rating_high:
+        searchterm.extend([_(u"Rating <= %(rating)s", rating=rating_high)])
+    if rating_low:
+        searchterm.extend([_(u"Rating >= %(rating)s", rating=rating_low)])
+    if read_status:
+        searchterm.extend([_(u"Read Status = %(status)s", status=read_status)])
+    searchterm.extend(ext for ext in tags['include_extension'])
+    searchterm.extend(ext for ext in tags['exclude_extension'])
+    # handle custom columns
+    searchterm = " + ".join(filter(None, searchterm))
+    return searchterm, pub_start, pub_end
+
+
+def render_adv_search_results(term, offset=None, order=None, limit=None):
+    sort = order[0] if order else [db.Books.sort]
+    pagination = None
+
+    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
+    calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
+    if not config.config_read_column:
+        query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, ub.ReadBook).select_from(db.Books)
+                 .outerjoin(ub.ReadBook, and_(db.Books.id == ub.ReadBook.book_id,
+                                              int(current_user.id) == ub.ReadBook.user_id)))
+    else:
+        try:
+            read_column = cc[config.config_read_column]
+            query = (calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, read_column.value)
+                     .select_from(db.Books)
+                     .outerjoin(read_column, read_column.book == db.Books.id))
+        except (KeyError, AttributeError):
+            log.error("Custom Column No.%d is not existing in calibre database", config.config_read_column)
+            # Skip linking read column
+            query = calibre_db.session.query(db.Books, ub.ArchivedBook.is_archived, None)
+    query = query.outerjoin(ub.ArchivedBook, and_(db.Books.id == ub.ArchivedBook.book_id,
+                                                  int(current_user.id) == ub.ArchivedBook.user_id))
+
+    q = query.outerjoin(db.books_series_link, db.Books.id == db.books_series_link.c.book)\
+        .outerjoin(db.Series)\
+        .filter(calibre_db.common_filters(True))
+
+    # parse multi selects to a complete dict
+    tags = dict()
+    elements = ['tag', 'serie', 'shelf', 'language', 'extension']
+    for element in elements:
+        tags['include_' + element] = term.get('include_' + element)
+        tags['exclude_' + element] = term.get('exclude_' + element)
+
+    author_name = term.get("author_name")
+    book_title = term.get("book_title")
+    publisher = term.get("publisher")
+    pub_start = term.get("publishstart")
+    pub_end = term.get("publishend")
+    rating_low = term.get("ratinghigh")
+    rating_high = term.get("ratinglow")
+    description = term.get("comment")
+    read_status = term.get("read_status")
+    if author_name:
+        author_name = author_name.strip().lower().replace(',', '|')
+    if book_title:
+        book_title = book_title.strip().lower()
+    if publisher:
+        publisher = publisher.strip().lower()
+
+    search_term = []
+    cc_present = False
+    for c in cc:
+        if c.datatype == "datetime":
+            column_start = term.get('custom_column_' + str(c.id) + '_start')
+            column_end = term.get('custom_column_' + str(c.id) + '_end')
+            if column_start:
+                search_term.extend([u"{} >= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
+                cc_present = True
+            if column_end:
+                search_term.extend([u"{} <= {}".format(c.name,
+                                                       format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
+                                                                   format='medium',
+                                                                   locale=get_locale())
+                                                       )])
+                cc_present = True
+        elif term.get('custom_column_' + str(c.id)):
+            search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
+            cc_present = True
+
+
+    if any(tags.values()) or author_name or book_title or publisher or pub_start or pub_end or rating_low \
+       or rating_high or description or cc_present or read_status:
+        search_term, pub_start, pub_end = extend_search_term(search_term,
+                                                             author_name,
+                                                             book_title,
+                                                             publisher,
+                                                             pub_start,
+                                                             pub_end,
+                                                             tags,
+                                                             rating_high,
+                                                             rating_low,
+                                                             read_status)
+        if author_name:
+            q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
+        if book_title:
+            q = q.filter(func.lower(db.Books.title).ilike("%" + book_title + "%"))
+        if pub_start:
+            q = q.filter(func.datetime(db.Books.pubdate) > func.datetime(pub_start))
+        if pub_end:
+            q = q.filter(func.datetime(db.Books.pubdate) < func.datetime(pub_end))
+        q = adv_search_read_status(q, read_status)
+        if publisher:
+            q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
+        q = adv_search_tag(q, tags['include_tag'], tags['exclude_tag'])
+        q = adv_search_serie(q, tags['include_serie'], tags['exclude_serie'])
+        q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
+        q = adv_search_extension(q, tags['include_extension'], tags['exclude_extension'])
+        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
+        q = adv_search_ratings(q, rating_high, rating_low)
+
+        if description:
+            q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
+
+        # search custom columns
+        try:
+            q = adv_search_custom_columns(cc, term, q)
+        except AttributeError as ex:
+            log.debug_or_exception(ex)
+            flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
+
+    q = q.order_by(*sort).all()
+    flask_session['query'] = json.dumps(term)
+    ub.store_combo_ids(q)
+    result_count = len(q)
+    if offset is not None and limit is not None:
+        offset = int(offset)
+        limit_all = offset + int(limit)
+        pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
+    else:
+        offset = 0
+        limit_all = result_count
+    entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
+    return render_title_template('search.html',
+                                 adv_searchterm=search_term,
+                                 pagination=pagination,
+                                 entries=entries,
+                                 result_count=result_count,
+                                 title=_(u"Advanced Search"), page="advsearch",
+                                 order=order[1])
+
+
+def render_prepare_search_form(cc):
+    # prepare data for search-form
+    tags = calibre_db.session.query(db.Tags)\
+        .join(db.books_tags_link)\
+        .join(db.Books)\
+        .filter(calibre_db.common_filters()) \
+        .group_by(text('books_tags_link.tag'))\
+        .order_by(db.Tags.name).all()
+    series = calibre_db.session.query(db.Series)\
+        .join(db.books_series_link)\
+        .join(db.Books)\
+        .filter(calibre_db.common_filters()) \
+        .group_by(text('books_series_link.series'))\
+        .order_by(db.Series.name)\
+        .filter(calibre_db.common_filters()).all()
+    shelves = ub.session.query(ub.Shelf)\
+        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id)))\
+        .order_by(ub.Shelf.name).all()
+    extensions = calibre_db.session.query(db.Data)\
+        .join(db.Books)\
+        .filter(calibre_db.common_filters()) \
+        .group_by(db.Data.format)\
+        .order_by(db.Data.format).all()
+    if current_user.filter_language() == u"all":
+        languages = calibre_db.speaking_language()
+    else:
+        languages = None
+    return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
+                                 series=series,shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
+
+
+def render_search_results(term, offset=None, order=None, limit=None):
+    join = db.books_series_link, db.Books.id == db.books_series_link.c.book, db.Series
+    entries, result_count, pagination = calibre_db.get_search_results(term,
+                                                                      config,
+                                                                      offset,
+                                                                      order,
+                                                                      limit,
+                                                                      False,
+                                                                      *join)
+    return render_title_template('search.html',
+                                 searchterm=term,
+                                 pagination=pagination,
+                                 query=term,
+                                 adv_searchterm=term,
+                                 entries=entries,
+                                 result_count=result_count,
+                                 title=_(u"Search"),
+                                 page="search",
+                                 order=order[1])
+
+
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index 0070e78f..ae95a28e 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -22,17 +22,17 @@ import inspect
 import json
 import os
 import sys
-# from time import time
-
+from dataclasses import asdict
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
 from flask_login import login_required
+from flask_babel import get_locale
 from sqlalchemy.exc import InvalidRequestError, OperationalError
 from sqlalchemy.orm.attributes import flag_modified
 
 from cps.services.Metadata import Metadata
-from . import constants, get_locale, logger, ub, web_server
+from . import constants, logger, ub, web_server
 
 # current_milli_time = lambda: int(round(time() * 1000))
 
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index e65d314a..bc7e928a 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -55,7 +55,8 @@ class TaskConvert(CalibreTask):
     def run(self, worker_thread):
         self.worker_thread = worker_thread
         if config.config_use_google_drive:
-            worker_db = db.CalibreDB(expire_on_commit=False)
+            worker_db = db.CalibreDB()
+            worker_db.init_db(expire_on_commit=False)
             cur_book = worker_db.get_book(self.book_id)
             self.title = cur_book.title
             data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
@@ -104,7 +105,8 @@ class TaskConvert(CalibreTask):
 
     def _convert_ebook_format(self):
         error_message = None
-        local_db = db.CalibreDB(expire_on_commit=False)
+        local_db = db.CalibreDB()
+        local_db.init_db(expire_on_commit=False)
         file_path = self.file_path
         book_id = self.book_id
         format_old_ext = u'.' + self.settings['old_book_format'].lower()
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index dcfd4226..2ecc57c8 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -68,7 +68,8 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.log = logger.create()
         self.book_id = book_id
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB()
+        self.calibre_db.init_db(expire_on_commit=False)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -238,7 +239,8 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB()
+        self.calibre_db.init_db(expire_on_commit=False)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -448,7 +450,8 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
-        self.calibre_db = db.CalibreDB(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB()
+        self.calibre_db.init_db(expire_on_commit=False)
         self.app_db_session = ub.get_new_session_instance()
         self.cache = fs.FileSystem()
 
diff --git a/cps/tasks_status.py b/cps/tasks_status.py
new file mode 100644
index 00000000..ca9b5796
--- /dev/null
+++ b/cps/tasks_status.py
@@ -0,0 +1,95 @@
+#  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
+#    Copyright (C) 2022 OzzieIsaacs
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from markupsafe import escape
+
+from flask import Blueprint, jsonify
+from flask_login import login_required, current_user
+from flask_babel import gettext as _
+from flask_babel import get_locale, format_datetime
+from babel.units import format_unit
+
+from . import logger
+from .render_template import render_title_template
+from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
+
+tasks = Blueprint('tasks', __name__)
+
+log = logger.create()
+
+
+@tasks.route("/ajax/emailstat")
+@login_required
+def get_email_status_json():
+    tasks = WorkerThread.getInstance().tasks
+    return jsonify(render_task_status(tasks))
+
+
+@tasks.route("/tasks")
+@login_required
+def get_tasks_status():
+    # if current user admin, show all email, otherwise only own emails
+    tasks = WorkerThread.getInstance().tasks
+    answer = render_task_status(tasks)
+    return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
+
+
+# helper function to apply localize status information in tasklist entries
+def render_task_status(tasklist):
+    rendered_tasklist = list()
+    for __, user, __, task in tasklist:
+        if user == current_user.name or current_user.role_admin():
+            ret = {}
+            if task.start_time:
+                ret['starttime'] = format_datetime(task.start_time, format='short', locale=get_locale())
+                ret['runtime'] = format_runtime(task.runtime)
+
+            # localize the task status
+            if isinstance(task.stat, int):
+                if task.stat == STAT_WAITING:
+                    ret['status'] = _(u'Waiting')
+                elif task.stat == STAT_FAIL:
+                    ret['status'] = _(u'Failed')
+                elif task.stat == STAT_STARTED:
+                    ret['status'] = _(u'Started')
+                elif task.stat == STAT_FINISH_SUCCESS:
+                    ret['status'] = _(u'Finished')
+                else:
+                    ret['status'] = _(u'Unknown Status')
+
+            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message)
+            ret['progress'] = "{} %".format(int(task.progress * 100))
+            ret['user'] = escape(user)  # prevent xss
+            rendered_tasklist.append(ret)
+
+    return rendered_tasklist
+
+
+# helper function for displaying the runtime of tasks
+def format_runtime(runtime):
+    ret_val = ""
+    if runtime.days:
+        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
+    minutes, seconds = divmod(runtime.seconds, 60)
+    hours, minutes = divmod(minutes, 60)
+    # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
+    if hours:
+        ret_val += '{:d}:{:02d}:{:02d}s'.format(hours, minutes, seconds)
+    elif minutes:
+        ret_val += '{:2d}:{:02d}s'.format(minutes, seconds)
+    else:
+        ret_val += '{:2d}s'.format(seconds)
+    return ret_val
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 42012937..7502514a 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -41,7 +41,7 @@
           <a class="navbar-brand" href="{{url_for('web.index')}}">{{instance}}</a>
         </div>
         {% if g.user.is_authenticated or g.allow_anonymous %}
-          <form class="navbar-form navbar-left" role="search" action="{{url_for('web.search')}}" method="GET">
+          <form class="navbar-form navbar-left" role="search" action="{{url_for('search.simple_search')}}" method="GET">
             <div class="form-group input-group input-group-sm">
               <label for="query" class="sr-only">{{_('Search')}}</label>
               <input type="text" class="form-control" id="query" name="query" placeholder="{{_('Search Library')}}" value="{{searchterm}}">
@@ -54,7 +54,7 @@
         <div class="navbar-collapse collapse">
           {% if g.user.is_authenticated or g.allow_anonymous %}
           <ul class="nav navbar-nav ">
-            <li><a href="{{url_for('web.advanced_search')}}" id="advanced_search"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
+            <li><a href="{{url_for('search.advanced_search')}}" id="advanced_search"><span class="glyphicon glyphicon-search"></span><span class="hidden-sm"> {{_('Advanced Search')}}</span></a></li>
           </ul>
           {% endif %}
           <ul class="nav navbar-nav navbar-right" id="main-nav">
@@ -71,7 +71,7 @@
                   </li>
               {% endif %}
               {% if not g.user.is_anonymous and not simple%}
-                <li><a id="top_tasks" href="{{url_for('web.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
+                <li><a id="top_tasks" href="{{url_for('tasks.get_tasks_status')}}"><span class="glyphicon glyphicon-tasks"></span> <span class="hidden-sm">{{_('Tasks')}}</span></a></li>
               {% endif %}
               {% if g.user.role_admin() %}
                 <li><a id="top_admin" data-text="{{_('Settings')}}" href="{{url_for('admin.admin')}}"><span class="glyphicon glyphicon-dashboard"></span> <span class="hidden-sm">{{_('Admin')}}</span></a></li>
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index c24ccd91..7bb9872a 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -2,7 +2,7 @@
 {% block body %}
 <h1 class="{{page}}">{{title}}</h1>
 <div class="col-md-10 col-lg-6">
-  <form role="form" id="search" action="{{ url_for('web.advanced_search_form') }}" method="POST">
+  <form role="form" id="search" action="{{ url_for('search.advanced_search_form') }}" method="POST">
     <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
     <div class="form-group">
       <label for="book_title">{{_('Book Title')}}</label>
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index 0e5a352b..b0b5b3bd 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -5,7 +5,7 @@
 {% block body %}
 <div class="discover">
     <h2>{{_('Tasks')}}</h2>
-    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('web.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
+    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('task.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
       <thead>
         <tr>
             {% if g.user.role_admin() %}
diff --git a/cps/ub.py b/cps/ub.py
index fdeff2bc..fd7a90ef 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -857,7 +857,7 @@ def init_db(app_db_path, user_credentials=None):
 
 
 def get_new_session_instance():
-    new_engine = create_engine(u'sqlite:///{0}'.format(cli.settings_path), echo=False)
+    new_engine = create_engine(u'sqlite:///{0}'.format(app_DB_path), echo=False)
     new_session = scoped_session(sessionmaker())
     new_session.configure(bind=new_engine)
 
diff --git a/cps/updater.py b/cps/updater.py
index f651719e..b47b80f5 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -28,7 +28,7 @@ from io import BytesIO
 from tempfile import gettempdir
 
 import requests
-from babel.dates import format_datetime
+from flask_babel import format_datetime
 from flask_babel import gettext as _
 
 from . import constants, logger  #  config, web_server
diff --git a/cps/uploader.py b/cps/uploader.py
index 276db326..5dbd1249 100644
--- a/cps/uploader.py
+++ b/cps/uploader.py
@@ -27,12 +27,6 @@ from .helper import split_authors
 
 log = logger.create()
 
-
-try:
-    from lxml.etree import LXML_VERSION as lxmlversion
-except ImportError:
-    lxmlversion = None
-
 try:
     from wand.image import Image, Color
     from wand import version as ImageVersion
@@ -101,7 +95,7 @@ def default_meta(tmp_file_path, original_file_name, original_file_extension):
         extension=original_file_extension,
         title=original_file_name,
         author=_(u'Unknown'),
-        cover=None, #pdf_preview(tmp_file_path, original_file_name),
+        cover=None,
         description="",
         tags="",
         series="",
@@ -237,29 +231,12 @@ def pdf_preview(tmp_file_path, tmp_dir):
         return None
 
 
-def get_versions(all=True):
+def get_versions():
     ret = dict()
     if not use_generic_pdf_cover:
         ret['Image Magick'] = ImageVersion.MAGICK_VERSION
     else:
         ret['Image Magick'] = u'not installed'
-    if all:
-        if not use_generic_pdf_cover:
-            ret['Wand'] = ImageVersion.VERSION
-        else:
-            ret['Wand'] = u'not installed'
-        if use_pdf_meta:
-            ret['PyPdf'] = PyPdfVersion
-        else:
-            ret['PyPdf'] = u'not installed'
-        if lxmlversion:
-            ret['lxml'] = '.'.join(map(str, lxmlversion))
-        else:
-            ret['lxml'] = u'not installed'
-        if comic.use_comic_meta:
-            ret['Comic_API'] = comic.comic_version or u'installed'
-        else:
-            ret['Comic_API'] = u'not installed'
     return ret
 
 
diff --git a/cps/web.py b/cps/web.py
index 44c195af..178ed18c 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 #  This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
 #    Copyright (C) 2018-2019 OzzieIsaacs, cervinko, jkrehm, bodybybuddha, ok11,
 #                            andy29485, idalin, Kyosfonica, wuqi, Kennyl, lemmsh,
@@ -21,35 +19,32 @@
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import os
-from datetime import datetime
 import json
 import mimetypes
 import chardet  # dependency of requests
 import copy
-from functools import wraps
 
-from babel.dates import format_date
 from babel import Locale
 from flask import Blueprint, jsonify
 from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for
 from flask import session as flask_session
 from flask_babel import gettext as _
+from flask_babel import get_locale
 from flask_login import login_user, logout_user, login_required, current_user
 from sqlalchemy.exc import IntegrityError, InvalidRequestError, OperationalError
-from sqlalchemy.sql.expression import text, func, false, not_, and_, or_
+from sqlalchemy.sql.expression import text, func, false, not_, and_
 from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.sql.functions import coalesce
 
-from .services.worker import WorkerThread
-
 from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash, check_password_hash
 
 from . import constants, logger, isoLanguages, services
-from . import babel, db, ub, config, get_locale, app
+from . import babel, db, ub, config, app
 from . import calibre_db, kobo_sync_status
+from .search import render_search_results, render_adv_search_results
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
-from .helper import check_valid_domain, render_task_status, check_email, check_username, \
+from .helper import check_valid_domain, check_email, check_username, \
     get_book_cover, get_series_cover_thumbnail, get_download_link, send_mail, generate_random_password, \
     send_registration_mail, check_send_to_kindle, check_read_formats, tags_filters, reset_password, valid_email, \
     edit_book_read_status
@@ -75,10 +70,12 @@ except ImportError:
     oauth_check = {}
     register_user_with_oauth = logout_oauth_user = get_oauth_status = None
 
-try:
-    from natsort import natsorted as sort
-except ImportError:
-    sort = sorted  # Just use regular sort then, may cause issues with badly named pages in cbz/cbr files
+from functools import wraps
+
+#try:
+#    from natsort import natsorted as sort
+#except ImportError:
+#    sort = sorted  # Just use regular sort then, may cause issues with badly named pages in cbz/cbr files
 
 
 @app.after_request
@@ -102,6 +99,7 @@ def add_security_headers(resp):
 
 
 web = Blueprint('web', __name__)
+
 log = logger.create()
 
 
@@ -770,57 +768,6 @@ def render_archived_books(page, sort_param):
                                  title=name, page=page_name, order=sort_param[1])
 
 
-def render_prepare_search_form(cc):
-    # prepare data for search-form
-    tags = calibre_db.session.query(db.Tags) \
-        .join(db.books_tags_link) \
-        .join(db.Books) \
-        .filter(calibre_db.common_filters()) \
-        .group_by(text('books_tags_link.tag')) \
-        .order_by(db.Tags.name).all()
-    series = calibre_db.session.query(db.Series) \
-        .join(db.books_series_link) \
-        .join(db.Books) \
-        .filter(calibre_db.common_filters()) \
-        .group_by(text('books_series_link.series')) \
-        .order_by(db.Series.name) \
-        .filter(calibre_db.common_filters()).all()
-    shelves = ub.session.query(ub.Shelf) \
-        .filter(or_(ub.Shelf.is_public == 1, ub.Shelf.user_id == int(current_user.id))) \
-        .order_by(ub.Shelf.name).all()
-    extensions = calibre_db.session.query(db.Data) \
-        .join(db.Books) \
-        .filter(calibre_db.common_filters()) \
-        .group_by(db.Data.format) \
-        .order_by(db.Data.format).all()
-    if current_user.filter_language() == u"all":
-        languages = calibre_db.speaking_language()
-    else:
-        languages = None
-    return render_title_template('search_form.html', tags=tags, languages=languages, extensions=extensions,
-                                 series=series, shelves=shelves, title=_(u"Advanced Search"), cc=cc, page="advsearch")
-
-
-def render_search_results(term, offset=None, order=None, limit=None):
-    join = db.books_series_link, db.books_series_link.c.book == db.Books.id, db.Series
-    entries, result_count, pagination = calibre_db.get_search_results(term,
-                                                                      config,
-                                                                      offset,
-                                                                      order,
-                                                                      limit,
-                                                                      *join)
-    return render_title_template('search.html',
-                                 searchterm=term,
-                                 pagination=pagination,
-                                 query=term,
-                                 adv_searchterm=term,
-                                 entries=entries,
-                                 result_count=result_count,
-                                 title=_(u"Search"),
-                                 page="search",
-                                 order=order[1])
-
-
 # ################################### View Books list ##################################################################
 
 
@@ -1153,321 +1100,6 @@ def category_list():
         abort(404)
 
 
-# ################################### Task functions ################################################################
-
-
-@web.route("/tasks")
-@login_required
-def get_tasks_status():
-    # if current user admin, show all email, otherwise only own emails
-    tasks = WorkerThread.get_instance().tasks
-    answer = render_task_status(tasks)
-    return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
-
-
-# ################################### Search functions ################################################################
-
-@web.route("/search", methods=["GET"])
-@login_required_if_no_ano
-def search():
-    term = request.args.get("query")
-    if term:
-        return redirect(url_for('web.books_list', data="search", sort_param='stored', query=term.strip()))
-    else:
-        return render_title_template('search.html',
-                                     searchterm="",
-                                     result_count=0,
-                                     title=_(u"Search"),
-                                     page="search")
-
-
-@web.route("/advsearch", methods=['POST'])
-@login_required_if_no_ano
-def advanced_search():
-    values = dict(request.form)
-    params = ['include_tag', 'exclude_tag', 'include_serie', 'exclude_serie', 'include_shelf', 'exclude_shelf',
-              'include_language', 'exclude_language', 'include_extension', 'exclude_extension']
-    for param in params:
-        values[param] = list(request.form.getlist(param))
-    flask_session['query'] = json.dumps(values)
-    return redirect(url_for('web.books_list', data="advsearch", sort_param='stored', query=""))
-
-
-def adv_search_custom_columns(cc, term, q):
-    for c in cc:
-        if c.datatype == "datetime":
-            custom_start = term.get('custom_column_' + str(c.id) + '_start')
-            custom_end = term.get('custom_column_' + str(c.id) + '_end')
-            if custom_start:
-                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                    func.datetime(db.cc_classes[c.id].value) >= func.datetime(custom_start)))
-            if custom_end:
-                q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                    func.datetime(db.cc_classes[c.id].value) <= func.datetime(custom_end)))
-        else:
-            custom_query = term.get('custom_column_' + str(c.id))
-            if custom_query != '' and custom_query is not None:
-                if c.datatype == 'bool':
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        db.cc_classes[c.id].value == (custom_query == "True")))
-                elif c.datatype == 'int' or c.datatype == 'float':
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        db.cc_classes[c.id].value == custom_query))
-                elif c.datatype == 'rating':
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        db.cc_classes[c.id].value == int(float(custom_query) * 2)))
-                else:
-                    q = q.filter(getattr(db.Books, 'custom_column_' + str(c.id)).any(
-                        func.lower(db.cc_classes[c.id].value).ilike("%" + custom_query + "%")))
-    return q
-
-
-def adv_search_read_status(q, read_status):
-    if read_status:
-        if config.config_read_column:
-            try:
-                if read_status == "True":
-                    q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
-                        .filter(db.cc_classes[config.config_read_column].value == True)
-                else:
-                    q = q.join(db.cc_classes[config.config_read_column], isouter=True) \
-                        .filter(coalesce(db.cc_classes[config.config_read_column].value, False) != True)
-            except (KeyError, AttributeError, IndexError):
-                log.error(
-                    "Custom Column No.{} is not existing in calibre database".format(config.config_read_column))
-                flash(_("Custom Column No.%(column)d is not existing in calibre database",
-                        column=config.config_read_column),
-                      category="error")
-                return q
-        else:
-            if read_status == "True":
-                q = q.join(ub.ReadBook, db.Books.id == ub.ReadBook.book_id, isouter=True) \
-                    .filter(ub.ReadBook.user_id == int(current_user.id),
-                            ub.ReadBook.read_status == ub.ReadBook.STATUS_FINISHED)
-            else:
-                q = q.join(ub.ReadBook, db.Books.id == ub.ReadBook.book_id, isouter=True) \
-                    .filter(ub.ReadBook.user_id == int(current_user.id),
-                            coalesce(ub.ReadBook.read_status, 0) != ub.ReadBook.STATUS_FINISHED)
-    return q
-
-
-def adv_search_language(q, include_languages_inputs, exclude_languages_inputs):
-    if current_user.filter_language() != "all":
-        q = q.filter(db.Books.languages.any(db.Languages.lang_code == current_user.filter_language()))
-    else:
-        return adv_search_text(q, include_languages_inputs, exclude_languages_inputs, db.Languages.id)
-    return q
-
-
-def adv_search_ratings(q, rating_high, rating_low):
-    if rating_high:
-        rating_high = int(rating_high) * 2
-        q = q.filter(db.Books.ratings.any(db.Ratings.rating <= rating_high))
-    if rating_low:
-        rating_low = int(rating_low) * 2
-        q = q.filter(db.Books.ratings.any(db.Ratings.rating >= rating_low))
-    return q
-
-
-def adv_search_text(q, include_inputs, exclude_inputs, data_table):
-    for inp in include_inputs:
-        q = q.filter(getattr(db.Books, data_table.class_.__tablename__).any(data_table == inp))
-    for excl in exclude_inputs:
-        q = q.filter(not_(getattr(db.Books, data_table.class_.__tablename__).any(data_table == excl)))
-    return q
-
-
-def adv_search_shelf(q, include_shelf_inputs, exclude_shelf_inputs):
-    q = q.outerjoin(ub.BookShelf, db.Books.id == ub.BookShelf.book_id) \
-        .filter(or_(ub.BookShelf.shelf == None, ub.BookShelf.shelf.notin_(exclude_shelf_inputs)))
-    if len(include_shelf_inputs) > 0:
-        q = q.filter(ub.BookShelf.shelf.in_(include_shelf_inputs))
-    return q
-
-
-def extend_search_term(searchterm,
-                       author_name,
-                       book_title,
-                       publisher,
-                       pub_start,
-                       pub_end,
-                       tags,
-                       rating_high,
-                       rating_low,
-                       read_status,
-                       ):
-    searchterm.extend((author_name.replace('|', ','), book_title, publisher))
-    if pub_start:
-        try:
-            searchterm.extend([_(u"Published after ") +
-                               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.strptime(pub_end, "%Y-%m-%d"),
-                                           format='medium', locale=get_locale())])
-        except ValueError:
-            pub_end = u""
-    elements = {'tag': db.Tags, 'serie': db.Series, 'shelf': ub.Shelf}
-    for key, db_element in elements.items():
-        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['include_' + key])).all()
-        searchterm.extend(tag.name for tag in tag_names)
-        tag_names = calibre_db.session.query(db_element).filter(db_element.id.in_(tags['exclude_' + key])).all()
-        searchterm.extend(tag.name for tag in tag_names)
-    language_names = calibre_db.session.query(db.Languages). \
-        filter(db.Languages.id.in_(tags['include_language'])).all()
-    if language_names:
-        language_names = calibre_db.speaking_language(language_names)
-    searchterm.extend(language.name for language in language_names)
-    language_names = calibre_db.session.query(db.Languages). \
-        filter(db.Languages.id.in_(tags['exclude_language'])).all()
-    if language_names:
-        language_names = calibre_db.speaking_language(language_names)
-    searchterm.extend(language.name for language in language_names)
-    if rating_high:
-        searchterm.extend([_(u"Rating <= %(rating)s", rating=rating_high)])
-    if rating_low:
-        searchterm.extend([_(u"Rating >= %(rating)s", rating=rating_low)])
-    if read_status:
-        searchterm.extend([_(u"Read Status = %(status)s", status=read_status)])
-    searchterm.extend(ext for ext in tags['include_extension'])
-    searchterm.extend(ext for ext in tags['exclude_extension'])
-    # handle custom columns
-    searchterm = " + ".join(filter(None, searchterm))
-    return searchterm, pub_start, pub_end
-
-
-def render_adv_search_results(term, offset=None, order=None, limit=None):
-    sort_param = order[0] if order else [db.Books.sort]
-    pagination = None
-
-    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
-    calibre_db.session.connection().connection.connection.create_function("lower", 1, db.lcase)
-    query = calibre_db.generate_linked_query(config.config_read_column, db.Books)
-    q = query.outerjoin(db.books_series_link, db.books_series_link.c.book == db.Books.id) \
-        .outerjoin(db.Series) \
-        .filter(calibre_db.common_filters(True))
-
-    # parse multiselects to a complete dict
-    tags = dict()
-    elements = ['tag', 'serie', 'shelf', 'language', 'extension']
-    for element in elements:
-        tags['include_' + element] = term.get('include_' + element)
-        tags['exclude_' + element] = term.get('exclude_' + element)
-
-    author_name = term.get("author_name")
-    book_title = term.get("book_title")
-    publisher = term.get("publisher")
-    pub_start = term.get("publishstart")
-    pub_end = term.get("publishend")
-    rating_low = term.get("ratinghigh")
-    rating_high = term.get("ratinglow")
-    description = term.get("comment")
-    read_status = term.get("read_status")
-    if author_name:
-        author_name = author_name.strip().lower().replace(',', '|')
-    if book_title:
-        book_title = book_title.strip().lower()
-    if publisher:
-        publisher = publisher.strip().lower()
-
-    search_term = []
-    cc_present = False
-    for c in cc:
-        if c.datatype == "datetime":
-            column_start = term.get('custom_column_' + str(c.id) + '_start')
-            column_end = term.get('custom_column_' + str(c.id) + '_end')
-            if column_start:
-                search_term.extend([u"{} >= {}".format(c.name,
-                                                       format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
-                                                       )])
-                cc_present = True
-            if column_end:
-                search_term.extend([u"{} <= {}".format(c.name,
-                                                       format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
-                                                       )])
-                cc_present = True
-        elif term.get('custom_column_' + str(c.id)):
-            search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
-            cc_present = True
-
-    if any(tags.values()) or author_name or book_title or \
-        publisher or pub_start or pub_end or rating_low or rating_high \
-            or description or cc_present or read_status:
-        search_term, pub_start, pub_end = extend_search_term(search_term,
-                                                             author_name,
-                                                             book_title,
-                                                             publisher,
-                                                             pub_start,
-                                                             pub_end,
-                                                             tags,
-                                                             rating_high,
-                                                             rating_low,
-                                                             read_status)
-        # q = q.filter()
-        if author_name:
-            q = q.filter(db.Books.authors.any(func.lower(db.Authors.name).ilike("%" + author_name + "%")))
-        if book_title:
-            q = q.filter(func.lower(db.Books.title).ilike("%" + book_title + "%"))
-        if pub_start:
-            q = q.filter(func.datetime(db.Books.pubdate) > func.datetime(pub_start))
-        if pub_end:
-            q = q.filter(func.datetime(db.Books.pubdate) < func.datetime(pub_end))
-        q = adv_search_read_status(q, read_status)
-        if publisher:
-            q = q.filter(db.Books.publishers.any(func.lower(db.Publishers.name).ilike("%" + publisher + "%")))
-        q = adv_search_text(q, tags['include_tag'], tags['exclude_tag'], db.Tags.id)
-        q = adv_search_text(q, tags['include_serie'], tags['exclude_serie'], db.Series.id)
-        q = adv_search_text(q, tags['include_extension'], tags['exclude_extension'], db.Data.format)
-        q = adv_search_shelf(q, tags['include_shelf'], tags['exclude_shelf'])
-        q = adv_search_language(q, tags['include_language'], tags['exclude_language'])
-        q = adv_search_ratings(q, rating_high, rating_low, )
-
-        if description:
-            q = q.filter(db.Books.comments.any(func.lower(db.Comments.text).ilike("%" + description + "%")))
-
-        # search custom columns
-        try:
-            q = adv_search_custom_columns(cc, term, q)
-        except AttributeError as ex:
-            log.error_or_exception(ex)
-            flash(_("Error on search for custom columns, please restart Calibre-Web"), category="error")
-
-    q = q.order_by(*sort_param).all()
-    flask_session['query'] = json.dumps(term)
-    ub.store_combo_ids(q)
-    result_count = len(q)
-    if offset is not None and limit is not None:
-        offset = int(offset)
-        limit_all = offset + int(limit)
-        pagination = Pagination((offset / (int(limit)) + 1), limit, result_count)
-    else:
-        offset = 0
-        limit_all = result_count
-    entries = calibre_db.order_authors(q[offset:limit_all], list_return=True, combined=True)
-    return render_title_template('search.html',
-                                 adv_searchterm=search_term,
-                                 pagination=pagination,
-                                 entries=entries,
-                                 result_count=result_count,
-                                 title=_(u"Advanced Search"),
-                                 page="advsearch",
-                                 order=order[1])
-
-
-@web.route("/advsearch", methods=['GET'])
-@login_required_if_no_ano
-def advanced_search_form():
-    # Build custom columns names
-    cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
-    return render_prepare_search_form(cc)
 
 
 # ################################### Download/Send ##################################################################
@@ -1892,10 +1524,10 @@ def show_book(book_id):
         entry.kindle_list = check_send_to_kindle(entry)
         entry.reader_list = check_read_formats(entry)
 
-        entry.audioentries = []
+        entry.audio_entries = []
         for media_format in entry.data:
             if media_format.format.lower() in constants.EXTENSIONS_AUDIO:
-                entry.audioentries.append(media_format.format.lower())
+                entry.audio_entries.append(media_format.format.lower())
 
         return render_title_template('detail.html',
                                      entry=entry,

From 2e007a160e652b2e7bbdeb5a8319560188324502 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 14:44:55 +0200
Subject: [PATCH 213/220] reenable startup logging Bugfixes from refactoring
 and merge

---
 cps/__init__.py          |    9 +-
 cps/admin.py             |  957 +++++++++++-----------
 cps/babel.py             |   18 +-
 cps/editbooks.py         | 1627 +++++++++++++++++++-------------------
 cps/helper.py            |   80 +-
 cps/kobo_auth.py         |   76 +-
 cps/main.py              |    8 +-
 cps/opds.py              |   28 +-
 cps/search.py            |    1 -
 cps/services/__init__.py |    5 +-
 cps/shelf.py             |  219 ++---
 cps/tasks_status.py      |    4 +-
 cps/templates/tasks.html |    2 +-
 cps/web.py               |    8 +-
 14 files changed, 1516 insertions(+), 1526 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index 0a452b17..f597aab5 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -27,16 +27,15 @@ from flask import Flask
 from .MyLoginManager import MyLoginManager
 from flask_principal import Principal
 
+from . import logger
 from .cli import CliParameter
 from .constants import CONFIG_DIR
 from .reverseproxy import ReverseProxied
 from .server import WebServer
 from .dep_check import dependency_check
-from . import services
 from .updater import Updater
-from .babel import babel, BABEL_TRANSLATIONS
+from .babel import babel
 from . import config_sql
-from . import logger
 from . import cache_buster
 from . import ub, db
 
@@ -157,8 +156,8 @@ def create_app():
     web_server.init_app(app, config)
 
     babel.init_app(app)
-    BABEL_TRANSLATIONS.update(str(item) for item in babel.list_translations())
-    BABEL_TRANSLATIONS.add('en')
+
+    from . import services
 
     if services.ldap:
         services.ldap.init_app(app, config)
diff --git a/cps/admin.py b/cps/admin.py
index 29f2319e..f5ae1037 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -28,6 +28,7 @@ import operator
 from datetime import datetime, timedelta, time
 from functools import wraps
 
+
 from flask import Blueprint, flash, redirect, url_for, abort, request, make_response, send_from_directory, g, Response
 from flask_login import login_required, current_user, logout_user, confirm_login
 from flask_babel import gettext as _
@@ -38,15 +39,16 @@ from sqlalchemy.orm.attributes import flag_modified
 from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
-from . import constants, logger, helper, services, cli
-from . import db, calibre_db, ub, web_server, config, updater_thread, babel, gdriveutils, \
+from . import constants, logger, helper, services, cli_param
+from . import db, calibre_db, ub, web_server, config, updater_thread, gdriveutils, \
     kobo_sync_status, schedule
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
-    valid_email, check_username, update_thumbnail_cache
+    valid_email, check_username
 from .gdriveutils import is_gdrive_ready, gdrive_support
 from .render_template import render_title_template, get_sidebar_config
 from .services.worker import WorkerThread
-from . import debug_info, BABEL_TRANSLATIONS
+from .babel import get_available_translations, get_available_locale, get_user_locale_language
+from . import debug_info
 
 
 log = logger.create()
@@ -57,7 +59,8 @@ feature_support = {
         'kobo':  bool(services.kobo),
         'updater': constants.UPDATER_AVAILABLE,
         'gmail': bool(services.gmail),
-        'scheduler': schedule.use_APScheduler
+        'scheduler': schedule.use_APScheduler,
+        'gdrive': gdrive_support
     }
 
 try:
@@ -76,7 +79,6 @@ except ImportError as err:
     oauth_check = {}
 
 
-feature_support['gdrive'] = gdrive_support
 admi = Blueprint('admin', __name__)
 
 
@@ -160,7 +162,7 @@ def shutdown():
 # needed for docker applications, as changes on metadata.db from host are not visible to application
 @admi.route("/reconnect", methods=['GET'])
 def reconnect():
-    if cli.reconnect_enable:
+    if cli_param.reconnect_enable:
         calibre_db.reconnect_db(config, ub.app_DB_path)
         return json.dumps({})
     else:
@@ -175,7 +177,7 @@ def update_thumbnails():
     content = config.get_scheduled_task_settings()
     if content['schedule_generate_book_covers']:
         log.info("Update of Cover cache requested")
-        update_thumbnail_cache()
+        helper.update_thumbnail_cache()
     return ""
 
 
@@ -264,7 +266,7 @@ def view_configuration():
     restrict_columns = calibre_db.session.query(db.CustomColumns)\
         .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all()
     languages = calibre_db.speaking_language()
-    translations = [Locale('en')] + babel.list_translations()
+    translations = get_available_locale()
     return render_title_template("config_view_edit.html", conf=config, readColumns=read_column,
                                  restrictColumns=restrict_columns,
                                  languages=languages,
@@ -278,7 +280,7 @@ def view_configuration():
 def edit_user_table():
     visibility = current_user.view_settings.get('useredit', {})
     languages = calibre_db.speaking_language()
-    translations = [LC('en')] + babel.list_translations()
+    translations = get_available_locale()
     all_user = ub.session.query(ub.User)
     tags = calibre_db.session.query(db.Tags)\
         .join(db.books_tags_link)\
@@ -349,7 +351,7 @@ def list_users():
         if user.default_language == "all":
             user.default = _("All")
         else:
-            user.default = Locale.parse(user.default_language).get_language_name(get_locale())
+            user.default = get_user_locale_language(user.default_language)
 
     table_entries = {'totalNotFiltered': total_count, 'total': filtered_count, "rows": users}
     js_list = json.dumps(table_entries, cls=db.AlchemyEncoder)
@@ -397,7 +399,7 @@ def delete_user():
 @login_required
 @admin_required
 def table_get_locale():
-    locale = [LC('en')] + babel.list_translations()
+    locale = get_available_locale()
     ret = list()
     current_locale = get_locale()
     for loc in locale:
@@ -498,7 +500,7 @@ def edit_list_user(param):
                 elif param == 'locale':
                     if user.name == "Guest":
                         raise Exception(_("Guest's Locale is determined automatically and can't be set"))
-                    if vals['value'] in BABEL_TRANSLATIONS:
+                    if vals['value'] in get_available_translations():
                         user.locale = vals['value']
                     else:
                         raise Exception(_("No Valid Locale Given"))
@@ -539,22 +541,6 @@ def update_table_settings():
     return ""
 
 
-def check_valid_read_column(column):
-    if column != "0":
-        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
-              .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
-            return False
-    return True
-
-
-def check_valid_restricted_column(column):
-    if column != "0":
-        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
-              .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
-            return False
-    return True
-
-
 @admi.route("/admin/viewconfig", methods=["POST"])
 @login_required
 @admin_required
@@ -759,43 +745,6 @@ def edit_restriction(res_type, user_id):
             ub.session_commit("Changed denied columns of user {} to {}".format(usr.name, usr.denied_column_value))
     return ""
 
-
-def restriction_addition(element, list_func):
-    elementlist = list_func()
-    if elementlist == ['']:
-        elementlist = []
-    if not element['add_element'] in elementlist:
-        elementlist += [element['add_element']]
-    return ','.join(elementlist)
-
-
-def restriction_deletion(element, list_func):
-    elementlist = list_func()
-    if element['Element'] in elementlist:
-        elementlist.remove(element['Element'])
-    return ','.join(elementlist)
-
-
-def prepare_tags(user, action, tags_name, id_list):
-    if "tags" in tags_name:
-        tags = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(id_list)).all()
-        if not tags:
-            raise Exception(_("Tag not found"))
-        new_tags_list = [x.name for x in tags]
-    else:
-        tags = calibre_db.session.query(db.cc_classes[config.config_restricted_column])\
-            .filter(db.cc_classes[config.config_restricted_column].id.in_(id_list)).all()
-        new_tags_list = [x.value for x in tags]
-    saved_tags_list = user.__dict__[tags_name].split(",") if len(user.__dict__[tags_name]) else []
-    if action == "remove":
-        saved_tags_list = [x for x in saved_tags_list if x not in new_tags_list]
-    elif action == "add":
-        saved_tags_list.extend(x for x in new_tags_list if x not in saved_tags_list)
-    else:
-        raise Exception(_("Invalid Action"))
-    return ",".join(saved_tags_list)
-
-
 @admi.route("/ajax/addrestriction/<int:res_type>", methods=['POST'])
 @login_required
 @admin_required
@@ -964,6 +913,58 @@ def ajax_pathchooser():
     return pathchooser()
 
 
+def check_valid_read_column(column):
+    if column != "0":
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'bool', db.CustomColumns.mark_for_delete == 0)).all():
+            return False
+    return True
+
+
+def check_valid_restricted_column(column):
+    if column != "0":
+        if not calibre_db.session.query(db.CustomColumns).filter(db.CustomColumns.id == column) \
+              .filter(and_(db.CustomColumns.datatype == 'text', db.CustomColumns.mark_for_delete == 0)).all():
+            return False
+    return True
+
+
+def restriction_addition(element, list_func):
+    elementlist = list_func()
+    if elementlist == ['']:
+        elementlist = []
+    if not element['add_element'] in elementlist:
+        elementlist += [element['add_element']]
+    return ','.join(elementlist)
+
+
+def restriction_deletion(element, list_func):
+    elementlist = list_func()
+    if element['Element'] in elementlist:
+        elementlist.remove(element['Element'])
+    return ','.join(elementlist)
+
+
+def prepare_tags(user, action, tags_name, id_list):
+    if "tags" in tags_name:
+        tags = calibre_db.session.query(db.Tags).filter(db.Tags.id.in_(id_list)).all()
+        if not tags:
+            raise Exception(_("Tag not found"))
+        new_tags_list = [x.name for x in tags]
+    else:
+        tags = calibre_db.session.query(db.cc_classes[config.config_restricted_column])\
+            .filter(db.cc_classes[config.config_restricted_column].id.in_(id_list)).all()
+        new_tags_list = [x.value for x in tags]
+    saved_tags_list = user.__dict__[tags_name].split(",") if len(user.__dict__[tags_name]) else []
+    if action == "remove":
+        saved_tags_list = [x for x in saved_tags_list if x not in new_tags_list]
+    elif action == "add":
+        saved_tags_list.extend(x for x in new_tags_list if x not in saved_tags_list)
+    else:
+        raise Exception(_("Invalid Action"))
+    return ",".join(saved_tags_list)
+
+
 def pathchooser():
     browse_for = "folder"
     folder_only = request.args.get('folder', False) == "true"
@@ -1207,6 +1208,420 @@ def simulatedbchange():
     return Response(json.dumps({"change": db_change, "valid": db_valid}), mimetype='application/json')
 
 
+@admi.route("/admin/user/new", methods=["GET", "POST"])
+@login_required
+@admin_required
+def new_user():
+    content = ub.User()
+    languages = calibre_db.speaking_language()
+    translations = get_available_locale()
+    kobo_support = feature_support['kobo'] and config.config_kobo_sync
+    if request.method == "POST":
+        to_save = request.form.to_dict()
+        _handle_new_user(to_save, content, languages, translations, kobo_support)
+    else:
+        content.role = config.config_default_role
+        content.sidebar_view = config.config_default_show
+        content.locale = config.config_default_locale
+        content.default_language = config.config_default_language
+    return render_title_template("user_edit.html", new_user=1, content=content,
+                                 config=config, translations=translations,
+                                 languages=languages, title=_(u"Add new user"), page="newuser",
+                                 kobo_support=kobo_support, registered_oauth=oauth_check)
+
+
+@admi.route("/admin/mailsettings")
+@login_required
+@admin_required
+def edit_mailsettings():
+    content = config.get_mail_settings()
+    return render_title_template("email_edit.html", content=content, title=_(u"Edit E-mail Server Settings"),
+                                 page="mailset", feature_support=feature_support)
+
+
+@admi.route("/admin/mailsettings", methods=["POST"])
+@login_required
+@admin_required
+def update_mailsettings():
+    to_save = request.form.to_dict()
+    _config_int(to_save, "mail_server_type")
+    if to_save.get("invalidate"):
+        config.mail_gmail_token = {}
+        try:
+            flag_modified(config, "mail_gmail_token")
+        except AttributeError:
+            pass
+    elif to_save.get("gmail"):
+        try:
+            config.mail_gmail_token = services.gmail.setup_gmail(config.mail_gmail_token)
+            flash(_(u"Gmail Account Verification Successful"), category="success")
+        except Exception as ex:
+            flash(str(ex), category="error")
+            log.error(ex)
+            return edit_mailsettings()
+
+    else:
+        _config_string(to_save, "mail_server")
+        _config_int(to_save, "mail_port")
+        _config_int(to_save, "mail_use_ssl")
+        _config_string(to_save, "mail_login")
+        _config_string(to_save, "mail_password")
+        _config_string(to_save, "mail_from")
+        _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
+    try:
+        config.save()
+    except (OperationalError, InvalidRequestError) as e:
+        ub.session.rollback()
+        log.error_or_exception("Settings Database error: {}".format(e))
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return edit_mailsettings()
+
+    if to_save.get("test"):
+        if current_user.email:
+            result = send_test_mail(current_user.email, current_user.name)
+            if result is None:
+                flash(_(u"Test e-mail queued for sending to %(email)s, please check Tasks for result",
+                        email=current_user.email), category="info")
+            else:
+                flash(_(u"There was an error sending the Test e-mail: %(res)s", res=result), category="error")
+        else:
+            flash(_(u"Please configure your e-mail address first..."), category="error")
+    else:
+        flash(_(u"E-mail server settings updated"), category="success")
+
+    return edit_mailsettings()
+
+
+@admi.route("/admin/scheduledtasks")
+@login_required
+@admin_required
+def edit_scheduledtasks():
+    content = config.get_scheduled_task_settings()
+    time_field = list()
+    duration_field = list()
+
+    for n in range(24):
+        time_field.append((n , format_time(time(hour=n), format="short",)))
+    for n in range(5, 65, 5):
+        t = timedelta(hours=n // 60, minutes=n % 60)
+        duration_field.append((n, format_timedelta(t, threshold=.9)))
+
+    return render_title_template("schedule_edit.html",
+                                 config=content,
+                                 starttime=time_field,
+                                 duration=duration_field,
+                                 title=_(u"Edit Scheduled Tasks Settings"))
+
+
+@admi.route("/admin/scheduledtasks", methods=["POST"])
+@login_required
+@admin_required
+def update_scheduledtasks():
+    error = False
+    to_save = request.form.to_dict()
+    if 0 <= int(to_save.get("schedule_start_time")) <= 23:
+        _config_int(to_save, "schedule_start_time")
+    else:
+        flash(_(u"Invalid start time for task specified"), category="error")
+        error = True
+    if 0 < int(to_save.get("schedule_duration")) <= 60:
+        _config_int(to_save, "schedule_duration")
+    else:
+        flash(_(u"Invalid duration for task specified"), category="error")
+        error = True
+    _config_checkbox(to_save, "schedule_generate_book_covers")
+    _config_checkbox(to_save, "schedule_generate_series_covers")
+    _config_checkbox(to_save, "schedule_reconnect")
+
+    if not error:
+        try:
+            config.save()
+            flash(_(u"Scheduled tasks settings updated"), category="success")
+
+            # Cancel any running tasks
+            schedule.end_scheduled_tasks()
+
+            # Re-register tasks with new settings
+            schedule.register_scheduled_tasks(config.schedule_reconnect)
+        except IntegrityError:
+            ub.session.rollback()
+            log.error("An unknown error occurred while saving scheduled tasks settings")
+            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+        except OperationalError:
+            ub.session.rollback()
+            log.error("Settings DB is not Writeable")
+            flash(_("Settings DB is not Writeable"), category="error")
+
+    return edit_scheduledtasks()
+
+
+@admi.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
+@login_required
+@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 or (not config.config_anonbrowse and content.name == "Guest"):
+        flash(_(u"User not found"), category="error")
+        return redirect(url_for('admin.admin'))
+    languages = calibre_db.speaking_language(return_all_languages=True)
+    translations = get_available_locale()
+    kobo_support = feature_support['kobo'] and config.config_kobo_sync
+    if request.method == "POST":
+        to_save = request.form.to_dict()
+        resp = _handle_edit_user(to_save, content, languages, translations, kobo_support)
+        if resp:
+            return resp
+    return render_title_template("user_edit.html",
+                                 translations=translations,
+                                 languages=languages,
+                                 new_user=0,
+                                 content=content,
+                                 config=config,
+                                 registered_oauth=oauth_check,
+                                 mail_configured=config.get_mail_server_configured(),
+                                 kobo_support=kobo_support,
+                                 title=_(u"Edit User %(nick)s", nick=content.name),
+                                 page="edituser")
+
+
+@admi.route("/admin/resetpassword/<int:user_id>", methods=["POST"])
+@login_required
+@admin_required
+def reset_user_password(user_id):
+    if current_user is not None and current_user.is_authenticated:
+        ret, message = reset_password(user_id)
+        if ret == 1:
+            log.debug(u"Password for user %s reset", message)
+            flash(_(u"Password for user %(user)s reset", user=message), category="success")
+        elif ret == 0:
+            log.error(u"An unknown error occurred. Please try again later.")
+            flash(_(u"An unknown error occurred. Please try again later."), category="error")
+        else:
+            log.error(u"Please configure the SMTP mail settings first...")
+            flash(_(u"Please configure the SMTP mail settings first..."), category="error")
+    return redirect(url_for('admin.admin'))
+
+
+@admi.route("/admin/logfile")
+@login_required
+@admin_required
+def view_logfile():
+    logfiles = {0: logger.get_logfile(config.config_logfile),
+                1: logger.get_accesslogfile(config.config_access_logfile)}
+    return render_title_template("logviewer.html",
+                                 title=_(u"Logfile viewer"),
+                                 accesslog_enable=config.config_access_log,
+                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
+                                 logfiles=logfiles,
+                                 page="logfile")
+
+
+@admi.route("/ajax/log/<int:logtype>")
+@login_required
+@admin_required
+def send_logfile(logtype):
+    if logtype == 1:
+        logfile = logger.get_accesslogfile(config.config_access_logfile)
+        return send_from_directory(os.path.dirname(logfile),
+                                   os.path.basename(logfile))
+    if logtype == 0:
+        logfile = logger.get_logfile(config.config_logfile)
+        return send_from_directory(os.path.dirname(logfile),
+                                   os.path.basename(logfile))
+    else:
+        return ""
+
+
+@admi.route("/admin/logdownload/<int:logtype>")
+@login_required
+@admin_required
+def download_log(logtype):
+    if logtype == 0:
+        file_name = logger.get_logfile(config.config_logfile)
+    elif logtype == 1:
+        file_name = logger.get_accesslogfile(config.config_access_logfile)
+    else:
+        abort(404)
+    if logger.is_valid_logfile(file_name):
+        return debug_info.assemble_logfiles(file_name)
+    abort(404)
+
+
+@admi.route("/admin/debug")
+@login_required
+@admin_required
+def download_debug():
+    return debug_info.send_debug()
+
+
+@admi.route("/get_update_status", methods=['GET'])
+@login_required
+@admin_required
+def get_update_status():
+    if feature_support['updater']:
+        log.info(u"Update status requested")
+        return updater_thread.get_available_updates(request.method, locale=get_locale())
+    else:
+        return ''
+
+
+@admi.route("/get_updater_status", methods=['GET', 'POST'])
+@login_required
+@admin_required
+def get_updater_status():
+    status = {}
+    if feature_support['updater']:
+        if request.method == "POST":
+            commit = request.form.to_dict()
+            if "start" in commit and commit['start'] == 'True':
+                txt = {
+                    "1": _(u'Requesting update package'),
+                    "2": _(u'Downloading update package'),
+                    "3": _(u'Unzipping update package'),
+                    "4": _(u'Replacing files'),
+                    "5": _(u'Database connections are closed'),
+                    "6": _(u'Stopping server'),
+                    "7": _(u'Update finished, please press okay and reload page'),
+                    "8": _(u'Update failed:') + u' ' + _(u'HTTP Error'),
+                    "9": _(u'Update failed:') + u' ' + _(u'Connection error'),
+                    "10": _(u'Update failed:') + u' ' + _(u'Timeout while establishing connection'),
+                    "11": _(u'Update failed:') + u' ' + _(u'General error'),
+                    "12": _(u'Update failed:') + u' ' + _(u'Update file could not be saved in temp dir'),
+                    "13": _(u'Update failed:') + u' ' + _(u'Files could not be replaced during update')
+                }
+                status['text'] = txt
+                updater_thread.status = 0
+                updater_thread.resume()
+                status['status'] = updater_thread.get_update_status()
+        elif request.method == "GET":
+            try:
+                status['status'] = updater_thread.get_update_status()
+                if status['status'] == -1:
+                    status['status'] = 7
+            except Exception:
+                status['status'] = 11
+        return json.dumps(status)
+    return ''
+
+
+def ldap_import_create_user(user, user_data):
+    user_login_field = extract_dynamic_field_from_filter(user, config.config_ldap_user_object)
+
+    try:
+        username = user_data[user_login_field][0].decode('utf-8')
+    except KeyError as ex:
+        log.error("Failed to extract LDAP user: %s - %s", user, ex)
+        message = _(u'Failed to extract at least One LDAP User')
+        return 0, message
+
+    # check for duplicate username
+    if ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).first():
+        # if ub.session.query(ub.User).filter(ub.User.name == username).first():
+        log.warning("LDAP User  %s Already in Database", user_data)
+        return 0, None
+
+    kindlemail = ''
+    if 'mail' in user_data:
+        useremail = user_data['mail'][0].decode('utf-8')
+        if len(user_data['mail']) > 1:
+            kindlemail = user_data['mail'][1].decode('utf-8')
+
+    else:
+        log.debug('No Mail Field Found in LDAP Response')
+        useremail = username + '@email.com'
+
+    try:
+        # check for duplicate email
+        useremail = check_email(useremail)
+    except Exception as ex:
+        log.warning("LDAP Email Error: {}, {}".format(user_data, ex))
+        return 0, None
+    content = ub.User()
+    content.name = username
+    content.password = ''  # dummy password which will be replaced by ldap one
+    content.email = useremail
+    content.kindle_mail = kindlemail
+    content.default_language = config.config_default_language
+    content.locale = config.config_default_locale
+    content.role = config.config_default_role
+    content.sidebar_view = config.config_default_show
+    content.allowed_tags = config.config_allowed_tags
+    content.denied_tags = config.config_denied_tags
+    content.allowed_column_value = config.config_allowed_column_value
+    content.denied_column_value = config.config_denied_column_value
+    ub.session.add(content)
+    try:
+        ub.session.commit()
+        return 1, None    # increase no of users
+    except Exception as ex:
+        log.warning("Failed to create LDAP user: %s - %s", user, ex)
+        ub.session.rollback()
+        message = _(u'Failed to Create at Least One LDAP User')
+        return 0, message
+
+
+@admi.route('/import_ldap_users', methods=["POST"])
+@login_required
+@admin_required
+def import_ldap_users():
+    showtext = {}
+    try:
+        new_users = services.ldap.get_group_members(config.config_ldap_group_name)
+    except (services.ldap.LDAPException, TypeError, AttributeError, KeyError) as e:
+        log.error_or_exception(e)
+        showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
+        return json.dumps(showtext)
+    if not new_users:
+        log.debug('LDAP empty response')
+        showtext['text'] = _(u'Error: No user returned in response of LDAP server')
+        return json.dumps(showtext)
+
+    imported = 0
+    for username in new_users:
+        user = username.decode('utf-8')
+        if '=' in user:
+            # if member object field is empty take user object as filter
+            if config.config_ldap_member_user_object:
+                query_filter = config.config_ldap_member_user_object
+            else:
+                query_filter = config.config_ldap_user_object
+            try:
+                user_identifier = extract_user_identifier(user, query_filter)
+            except Exception as ex:
+                log.warning(ex)
+                continue
+        else:
+            user_identifier = user
+            query_filter = None
+        try:
+            user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
+        except AttributeError as ex:
+            log.error_or_exception(ex)
+            continue
+        if user_data:
+            user_count, message = ldap_import_create_user(user, user_data)
+            if message:
+                showtext['text'] = message
+            else:
+                imported += user_count
+        else:
+            log.warning("LDAP User: %s Not Found", user)
+            showtext['text'] = _(u'At Least One LDAP User Not Found in Database')
+    if not showtext:
+        showtext['text'] = _(u'{} User Successfully Imported'.format(imported))
+    return json.dumps(showtext)
+
+
+@admi.route("/ajax/canceltask", methods=['POST'])
+@login_required
+@admin_required
+def cancel_task():
+    task_id = request.get_json().get('task_id', None)
+    worker = WorkerThread.get_instance()
+    worker.end_task(task_id)
+    return ""
+
+
 def _db_simulate_change():
     param = request.form.to_dict()
     to_save = dict()
@@ -1575,406 +1990,6 @@ def _handle_edit_user(to_save, content, languages, translations, kobo_support):
     return ""
 
 
-@admi.route("/admin/user/new", methods=["GET", "POST"])
-@login_required
-@admin_required
-def new_user():
-    content = ub.User()
-    languages = calibre_db.speaking_language()
-    translations = [Locale('en')] + babel.list_translations()
-    kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        _handle_new_user(to_save, content, languages, translations, kobo_support)
-    else:
-        content.role = config.config_default_role
-        content.sidebar_view = config.config_default_show
-        content.locale = config.config_default_locale
-        content.default_language = config.config_default_language
-    return render_title_template("user_edit.html", new_user=1, content=content,
-                                 config=config, translations=translations,
-                                 languages=languages, title=_(u"Add new user"), page="newuser",
-                                 kobo_support=kobo_support, registered_oauth=oauth_check)
-
-
-@admi.route("/admin/mailsettings")
-@login_required
-@admin_required
-def edit_mailsettings():
-    content = config.get_mail_settings()
-    return render_title_template("email_edit.html", content=content, title=_(u"Edit E-mail Server Settings"),
-                                 page="mailset", feature_support=feature_support)
-
-
-@admi.route("/admin/mailsettings", methods=["POST"])
-@login_required
-@admin_required
-def update_mailsettings():
-    to_save = request.form.to_dict()
-    _config_int(to_save, "mail_server_type")
-    if to_save.get("invalidate"):
-        config.mail_gmail_token = {}
-        try:
-            flag_modified(config, "mail_gmail_token")
-        except AttributeError:
-            pass
-    elif to_save.get("gmail"):
-        try:
-            config.mail_gmail_token = services.gmail.setup_gmail(config.mail_gmail_token)
-            flash(_(u"Gmail Account Verification Successful"), category="success")
-        except Exception as ex:
-            flash(str(ex), category="error")
-            log.error(ex)
-            return edit_mailsettings()
-
-    else:
-        _config_string(to_save, "mail_server")
-        _config_int(to_save, "mail_port")
-        _config_int(to_save, "mail_use_ssl")
-        _config_string(to_save, "mail_login")
-        _config_string(to_save, "mail_password")
-        _config_string(to_save, "mail_from")
-        _config_int(to_save, "mail_size", lambda y: int(y)*1024*1024)
-    try:
-        config.save()
-    except (OperationalError, InvalidRequestError) as e:
-        ub.session.rollback()
-        log.error_or_exception("Settings Database error: {}".format(e))
-        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-        return edit_mailsettings()
-
-    if to_save.get("test"):
-        if current_user.email:
-            result = send_test_mail(current_user.email, current_user.name)
-            if result is None:
-                flash(_(u"Test e-mail queued for sending to %(email)s, please check Tasks for result",
-                        email=current_user.email), category="info")
-            else:
-                flash(_(u"There was an error sending the Test e-mail: %(res)s", res=result), category="error")
-        else:
-            flash(_(u"Please configure your e-mail address first..."), category="error")
-    else:
-        flash(_(u"E-mail server settings updated"), category="success")
-
-    return edit_mailsettings()
-
-
-@admi.route("/admin/scheduledtasks")
-@login_required
-@admin_required
-def edit_scheduledtasks():
-    content = config.get_scheduled_task_settings()
-    time_field = list()
-    duration_field = list()
-
-    for n in range(24):
-        time_field.append((n , format_time(time(hour=n), format="short",)))
-    for n in range(5, 65, 5):
-        t = timedelta(hours=n // 60, minutes=n % 60)
-        duration_field.append((n, format_timedelta(t, threshold=.9)))
-
-    return render_title_template("schedule_edit.html", config=content, starttime=time_field, duration=duration_field, title=_(u"Edit Scheduled Tasks Settings"))
-
-
-@admi.route("/admin/scheduledtasks", methods=["POST"])
-@login_required
-@admin_required
-def update_scheduledtasks():
-    error = False
-    to_save = request.form.to_dict()
-    if 0 <= int(to_save.get("schedule_start_time")) <= 23:
-        _config_int(to_save, "schedule_start_time")
-    else:
-        flash(_(u"Invalid start time for task specified"), category="error")
-        error = True
-    if 0 < int(to_save.get("schedule_duration")) <= 60:
-        _config_int(to_save, "schedule_duration")
-    else:
-        flash(_(u"Invalid duration for task specified"), category="error")
-        error = True
-    _config_checkbox(to_save, "schedule_generate_book_covers")
-    _config_checkbox(to_save, "schedule_generate_series_covers")
-    _config_checkbox(to_save, "schedule_reconnect")
-
-    if not error:
-        try:
-            config.save()
-            flash(_(u"Scheduled tasks settings updated"), category="success")
-
-            # Cancel any running tasks
-            schedule.end_scheduled_tasks()
-
-            # Re-register tasks with new settings
-            schedule.register_scheduled_tasks(config.schedule_reconnect)
-        except IntegrityError:
-            ub.session.rollback()
-            log.error("An unknown error occurred while saving scheduled tasks settings")
-            flash(_(u"An unknown error occurred. Please try again later."), category="error")
-        except OperationalError:
-            ub.session.rollback()
-            log.error("Settings DB is not Writeable")
-            flash(_("Settings DB is not Writeable"), category="error")
-
-    return edit_scheduledtasks()
-
-
-@admi.route("/admin/user/<int:user_id>", methods=["GET", "POST"])
-@login_required
-@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 or (not config.config_anonbrowse and content.name == "Guest"):
-        flash(_(u"User not found"), category="error")
-        return redirect(url_for('admin.admin'))
-    languages = calibre_db.speaking_language(return_all_languages=True)
-    translations = babel.list_translations() + [Locale('en')]
-    kobo_support = feature_support['kobo'] and config.config_kobo_sync
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        resp = _handle_edit_user(to_save, content, languages, translations, kobo_support)
-        if resp:
-            return resp
-    return render_title_template("user_edit.html",
-                                 translations=translations,
-                                 languages=languages,
-                                 new_user=0,
-                                 content=content,
-                                 config=config,
-                                 registered_oauth=oauth_check,
-                                 mail_configured=config.get_mail_server_configured(),
-                                 kobo_support=kobo_support,
-                                 title=_(u"Edit User %(nick)s", nick=content.name),
-                                 page="edituser")
-
-
-@admi.route("/admin/resetpassword/<int:user_id>", methods=["POST"])
-@login_required
-@admin_required
-def reset_user_password(user_id):
-    if current_user is not None and current_user.is_authenticated:
-        ret, message = reset_password(user_id)
-        if ret == 1:
-            log.debug(u"Password for user %s reset", message)
-            flash(_(u"Password for user %(user)s reset", user=message), category="success")
-        elif ret == 0:
-            log.error(u"An unknown error occurred. Please try again later.")
-            flash(_(u"An unknown error occurred. Please try again later."), category="error")
-        else:
-            log.error(u"Please configure the SMTP mail settings first...")
-            flash(_(u"Please configure the SMTP mail settings first..."), category="error")
-    return redirect(url_for('admin.admin'))
-
-
-@admi.route("/admin/logfile")
-@login_required
-@admin_required
-def view_logfile():
-    logfiles = {0: logger.get_logfile(config.config_logfile),
-                1: logger.get_accesslogfile(config.config_access_logfile)}
-    return render_title_template("logviewer.html",
-                                 title=_(u"Logfile viewer"),
-                                 accesslog_enable=config.config_access_log,
-                                 log_enable=bool(config.config_logfile != logger.LOG_TO_STDOUT),
-                                 logfiles=logfiles,
-                                 page="logfile")
-
-
-@admi.route("/ajax/log/<int:logtype>")
-@login_required
-@admin_required
-def send_logfile(logtype):
-    if logtype == 1:
-        logfile = logger.get_accesslogfile(config.config_access_logfile)
-        return send_from_directory(os.path.dirname(logfile),
-                                   os.path.basename(logfile))
-    if logtype == 0:
-        logfile = logger.get_logfile(config.config_logfile)
-        return send_from_directory(os.path.dirname(logfile),
-                                   os.path.basename(logfile))
-    else:
-        return ""
-
-
-@admi.route("/admin/logdownload/<int:logtype>")
-@login_required
-@admin_required
-def download_log(logtype):
-    if logtype == 0:
-        file_name = logger.get_logfile(config.config_logfile)
-    elif logtype == 1:
-        file_name = logger.get_accesslogfile(config.config_access_logfile)
-    else:
-        abort(404)
-    if logger.is_valid_logfile(file_name):
-        return debug_info.assemble_logfiles(file_name)
-    abort(404)
-
-
-@admi.route("/admin/debug")
-@login_required
-@admin_required
-def download_debug():
-    return debug_info.send_debug()
-
-
-@admi.route("/get_update_status", methods=['GET'])
-@login_required
-@admin_required
-def get_update_status():
-    if feature_support['updater']:
-        log.info(u"Update status requested")
-        return updater_thread.get_available_updates(request.method, locale=get_locale())
-    else:
-        return ''
-
-
-@admi.route("/get_updater_status", methods=['GET', 'POST'])
-@login_required
-@admin_required
-def get_updater_status():
-    status = {}
-    if feature_support['updater']:
-        if request.method == "POST":
-            commit = request.form.to_dict()
-            if "start" in commit and commit['start'] == 'True':
-                txt = {
-                    "1": _(u'Requesting update package'),
-                    "2": _(u'Downloading update package'),
-                    "3": _(u'Unzipping update package'),
-                    "4": _(u'Replacing files'),
-                    "5": _(u'Database connections are closed'),
-                    "6": _(u'Stopping server'),
-                    "7": _(u'Update finished, please press okay and reload page'),
-                    "8": _(u'Update failed:') + u' ' + _(u'HTTP Error'),
-                    "9": _(u'Update failed:') + u' ' + _(u'Connection error'),
-                    "10": _(u'Update failed:') + u' ' + _(u'Timeout while establishing connection'),
-                    "11": _(u'Update failed:') + u' ' + _(u'General error'),
-                    "12": _(u'Update failed:') + u' ' + _(u'Update file could not be saved in temp dir'),
-                    "13": _(u'Update failed:') + u' ' + _(u'Files could not be replaced during update')
-                }
-                status['text'] = txt
-                updater_thread.status = 0
-                updater_thread.resume()
-                status['status'] = updater_thread.get_update_status()
-        elif request.method == "GET":
-            try:
-                status['status'] = updater_thread.get_update_status()
-                if status['status'] == -1:
-                    status['status'] = 7
-            except Exception:
-                status['status'] = 11
-        return json.dumps(status)
-    return ''
-
-
-def ldap_import_create_user(user, user_data):
-    user_login_field = extract_dynamic_field_from_filter(user, config.config_ldap_user_object)
-
-    try:
-        username = user_data[user_login_field][0].decode('utf-8')
-    except KeyError as ex:
-        log.error("Failed to extract LDAP user: %s - %s", user, ex)
-        message = _(u'Failed to extract at least One LDAP User')
-        return 0, message
-
-    # check for duplicate username
-    if ub.session.query(ub.User).filter(func.lower(ub.User.name) == username.lower()).first():
-        # if ub.session.query(ub.User).filter(ub.User.name == username).first():
-        log.warning("LDAP User  %s Already in Database", user_data)
-        return 0, None
-
-    kindlemail = ''
-    if 'mail' in user_data:
-        useremail = user_data['mail'][0].decode('utf-8')
-        if len(user_data['mail']) > 1:
-            kindlemail = user_data['mail'][1].decode('utf-8')
-
-    else:
-        log.debug('No Mail Field Found in LDAP Response')
-        useremail = username + '@email.com'
-
-    try:
-        # check for duplicate email
-        useremail = check_email(useremail)
-    except Exception as ex:
-        log.warning("LDAP Email Error: {}, {}".format(user_data, ex))
-        return 0, None
-    content = ub.User()
-    content.name = username
-    content.password = ''  # dummy password which will be replaced by ldap one
-    content.email = useremail
-    content.kindle_mail = kindlemail
-    content.default_language = config.config_default_language
-    content.locale = config.config_default_locale
-    content.role = config.config_default_role
-    content.sidebar_view = config.config_default_show
-    content.allowed_tags = config.config_allowed_tags
-    content.denied_tags = config.config_denied_tags
-    content.allowed_column_value = config.config_allowed_column_value
-    content.denied_column_value = config.config_denied_column_value
-    ub.session.add(content)
-    try:
-        ub.session.commit()
-        return 1, None    # increase no of users
-    except Exception as ex:
-        log.warning("Failed to create LDAP user: %s - %s", user, ex)
-        ub.session.rollback()
-        message = _(u'Failed to Create at Least One LDAP User')
-        return 0, message
-
-
-@admi.route('/import_ldap_users', methods=["POST"])
-@login_required
-@admin_required
-def import_ldap_users():
-    showtext = {}
-    try:
-        new_users = services.ldap.get_group_members(config.config_ldap_group_name)
-    except (services.ldap.LDAPException, TypeError, AttributeError, KeyError) as e:
-        log.error_or_exception(e)
-        showtext['text'] = _(u'Error: %(ldaperror)s', ldaperror=e)
-        return json.dumps(showtext)
-    if not new_users:
-        log.debug('LDAP empty response')
-        showtext['text'] = _(u'Error: No user returned in response of LDAP server')
-        return json.dumps(showtext)
-
-    imported = 0
-    for username in new_users:
-        user = username.decode('utf-8')
-        if '=' in user:
-            # if member object field is empty take user object as filter
-            if config.config_ldap_member_user_object:
-                query_filter = config.config_ldap_member_user_object
-            else:
-                query_filter = config.config_ldap_user_object
-            try:
-                user_identifier = extract_user_identifier(user, query_filter)
-            except Exception as ex:
-                log.warning(ex)
-                continue
-        else:
-            user_identifier = user
-            query_filter = None
-        try:
-            user_data = services.ldap.get_object_details(user=user_identifier, query_filter=query_filter)
-        except AttributeError as ex:
-            log.error_or_exception(ex)
-            continue
-        if user_data:
-            user_count, message = ldap_import_create_user(user, user_data)
-            if message:
-                showtext['text'] = message
-            else:
-                imported += user_count
-        else:
-            log.warning("LDAP User: %s Not Found", user)
-            showtext['text'] = _(u'At Least One LDAP User Not Found in Database')
-    if not showtext:
-        showtext['text'] = _(u'{} User Successfully Imported'.format(imported))
-    return json.dumps(showtext)
-
-
 def extract_user_data_from_field(user, field):
     match = re.search(field + r"=([\.\d\s\w-]+)", user, re.IGNORECASE | re.UNICODE)
     if match:
@@ -1994,13 +2009,3 @@ def extract_dynamic_field_from_filter(user, filtr):
 def extract_user_identifier(user, filtr):
     dynamic_field = extract_dynamic_field_from_filter(user, filtr)
     return extract_user_data_from_field(user, dynamic_field)
-
-
-@admi.route("/ajax/canceltask", methods=['POST'])
-@login_required
-@admin_required
-def cancel_task():
-    task_id = request.get_json().get('task_id', None)
-    worker = WorkerThread.get_instance()
-    worker.end_task(task_id)
-    return ""
diff --git a/cps/babel.py b/cps/babel.py
index b0d5c238..c1675809 100644
--- a/cps/babel.py
+++ b/cps/babel.py
@@ -1,4 +1,4 @@
-from babel import Locale as LC
+from babel import Locale
 from babel import negotiate_locale
 from flask_babel import Babel
 from babel.core import UnknownLocaleError
@@ -9,7 +9,7 @@ from . import logger
 log = logger.create()
 
 babel = Babel()
-BABEL_TRANSLATIONS = set()
+
 
 @babel.localeselector
 def get_locale():
@@ -23,8 +23,18 @@ def get_locale():
     if request.accept_languages:
         for x in request.accept_languages.values():
             try:
-                preferred.append(str(LC.parse(x.replace('-', '_'))))
+                preferred.append(str(Locale.parse(x.replace('-', '_'))))
             except (UnknownLocaleError, ValueError) as e:
                 log.debug('Could not parse locale "%s": %s', x, e)
 
-    return negotiate_locale(preferred or ['en'], BABEL_TRANSLATIONS)
+    return negotiate_locale(preferred or ['en'], get_available_translations())
+
+
+def get_user_locale_language(user_language):
+    return Locale.parse(user_language).get_language_name(get_locale())
+
+def get_available_locale():
+    return [Locale('en')] + babel.list_translations()
+
+def get_available_translations():
+    return set(str(item) for item in get_available_locale())
diff --git a/cps/editbooks.py b/cps/editbooks.py
index 3ac3dfb8..d3615050 100755
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -39,10 +39,9 @@ from flask_babel import lazy_gettext as N_
 from flask_babel import get_locale
 from flask_login import current_user, login_required
 from sqlalchemy.exc import OperationalError, IntegrityError
-# from sqlite3 import OperationalError as sqliteOperationalError
+
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper, kobo_sync_status
-from . import config, ub, db
-from . import calibre_db
+from . import config, ub, db, calibre_db
 from .services.worker import WorkerThread
 from .tasks.upload import TaskUpload
 from .render_template import render_title_template
@@ -74,161 +73,6 @@ def edit_required(f):
     return inner
 
 
-def search_objects_remove(db_book_object, db_type, input_elements):
-    del_elements = []
-    for c_elements in db_book_object:
-        found = False
-        if db_type == 'languages':
-            type_elements = c_elements.lang_code
-        elif db_type == 'custom':
-            type_elements = c_elements.value
-        else:
-            type_elements = c_elements.name
-        for inp_element in input_elements:
-            if inp_element.lower() == type_elements.lower():
-                found = True
-                break
-        # if the element was not found in the new list, add it to remove list
-        if not found:
-            del_elements.append(c_elements)
-    return del_elements
-
-
-def search_objects_add(db_book_object, db_type, input_elements):
-    add_elements = []
-    for inp_element in input_elements:
-        found = False
-        for c_elements in db_book_object:
-            if db_type == 'languages':
-                type_elements = c_elements.lang_code
-            elif db_type == 'custom':
-                type_elements = c_elements.value
-            else:
-                type_elements = c_elements.name
-            if inp_element == type_elements:
-                found = True
-                break
-        if not found:
-            add_elements.append(inp_element)
-    return add_elements
-
-
-def remove_objects(db_book_object, db_session, del_elements):
-    changed = False
-    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)
-    return changed
-
-
-def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
-    changed = False
-    if db_type == 'languages':
-        db_filter = db_object.lang_code
-    elif db_type == 'custom':
-        db_filter = db_object.value
-    else:
-        db_filter = db_object.name
-    for add_element in add_elements:
-        # check if an element with that name exists
-        db_element = db_session.query(db_object).filter(db_filter == add_element).first()
-        # if no element is found add it
-        if db_type == 'author':
-            new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "")
-        elif db_type == 'series':
-            new_element = db_object(add_element, add_element)
-        elif db_type == 'custom':
-            new_element = db_object(value=add_element)
-        elif db_type == 'publisher':
-            new_element = db_object(add_element, None)
-        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:
-            db_element = create_objects_for_addition(db_element, add_element, db_type)
-            # add element to book
-            changed = True
-            db_book_object.append(db_element)
-    return changed
-
-
-def create_objects_for_addition(db_element, add_element, db_type):
-    if db_type == 'custom':
-        if db_element.value != add_element:
-            db_element.value = add_element
-    elif db_type == 'languages':
-        if db_element.lang_code != add_element:
-            db_element.lang_code = add_element
-    elif db_type == 'series':
-        if db_element.name != add_element:
-            db_element.name = add_element
-            db_element.sort = add_element
-    elif db_type == 'author':
-        if db_element.name != add_element:
-            db_element.name = add_element
-            db_element.sort = helper.get_sorted_author(add_element.replace('|', ','))
-    elif db_type == 'publisher':
-        if db_element.name != add_element:
-            db_element.name = add_element
-            db_element.sort = None
-    elif db_element.name != add_element:
-        db_element.name = add_element
-    return db_element
-
-
-# Modifies different Database objects, first check if elements have to be deleted,
-# because they are no longer used, than check if elements have to be added to database
-def modify_database_object(input_elements, db_book_object, db_object, db_session, db_type):
-    # 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")
-    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
-    del_elements = search_objects_remove(db_book_object, db_type, input_elements)
-    # 2. search for elements that need to be added
-    add_elements = search_objects_add(db_book_object, db_type, input_elements)
-    # if there are elements to remove, we remove them now
-    changed = remove_objects(db_book_object, db_session, del_elements)
-    # if there are elements to add, we add them now!
-    if len(add_elements) > 0:
-        changed |= add_objects(db_book_object, db_object, db_session, db_type, add_elements)
-    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
-    error = False
-    input_dict = dict([(identifier.type.lower(), identifier) for identifier in input_identifiers])
-    if len(input_identifiers) != len(input_dict):
-        error = True
-    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
-            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)
-            changed = True
-    return changed, error
-
-
 @editbook.route("/ajax/delete/<int:book_id>", methods=["POST"])
 @login_required
 def delete_book_from_details(book_id):
@@ -242,6 +86,677 @@ def delete_book_ajax(book_id, book_format):
     return delete_book_from_table(book_id, book_format, False)
 
 
+@editbook.route("/admin/book/<int:book_id>", methods=['GET'])
+@login_required_if_no_ano
+@edit_required
+def show_edit_book(book_id):
+    return render_edit_book(book_id)
+
+
+@editbook.route("/admin/book/<int:book_id>", methods=['POST'])
+@login_required_if_no_ano
+@edit_required
+def edit_book(book_id):
+    modify_date = False
+    edit_error = False
+
+    # create the function for sorting...
+    calibre_db.update_title_sort(config)
+
+    book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
+    # Book not found
+    if not book:
+        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+              category="error")
+        return redirect(url_for("web.index"))
+
+    to_save = request.form.to_dict()
+
+    try:
+        # Update folder of book on local disk
+        edited_books_id = None
+        title_author_error = None
+        # handle book title change
+        title_change = handle_title_on_edit(book, to_save["book_title"])
+        # handle book author change
+        input_authors, author_change, renamed = handle_author_on_edit(book, to_save["author_name"])
+        if author_change or title_change:
+            edited_books_id = book.id
+            modify_date = True
+            title_author_error = helper.update_dir_structure(edited_books_id,
+                                                             config.config_calibre_dir,
+                                                             input_authors[0],
+                                                             renamed_author=renamed)
+        if title_author_error:
+            flash(title_author_error, category="error")
+            calibre_db.session.rollback()
+            book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
+
+        # handle upload other formats from local disk
+        meta = upload_single_file(request, book, book_id)
+        # only merge metadata if file was uploaded and no error occurred (meta equals not false or none)
+        if meta:
+            merge_metadata(to_save, meta)
+        # handle upload covers from local disk
+        cover_upload_success = upload_cover(request, book)
+        if cover_upload_success:
+            book.has_cover = 1
+            modify_date = True
+
+        # upload new covers or new file formats to google drive
+        if config.config_use_google_drive:
+            gdriveutils.updateGdriveCalibreFromLocal()
+
+        if to_save.get("cover_url", None):
+            if not current_user.role_upload():
+                edit_error = True
+                flash(_(u"User has no rights to upload cover"), category="error")
+            if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
+                book.has_cover = 0
+            else:
+                result, error = helper.save_cover_from_url(to_save["cover_url"].strip(), book.path)
+                if result is True:
+                    book.has_cover = 1
+                    modify_date = True
+                    helper.replace_cover_thumbnail_cache(book.id)
+                else:
+                    flash(error, category="error")
+
+        # Add default series_index to book
+        modify_date |= edit_book_series_index(to_save["series_index"], book)
+        # Handle book comments/description
+        modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
+        # Handle identifiers
+        input_identifiers = identifier_list(to_save, book)
+        modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
+        if warning:
+            flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+        modify_date |= modification
+        # Handle book tags
+        modify_date |= edit_book_tags(to_save['tags'], book)
+        # Handle book series
+        modify_date |= edit_book_series(to_save["series"], book)
+        # handle book publisher
+        modify_date |= edit_book_publisher(to_save['publisher'], book)
+        # handle book languages
+        try:
+            modify_date |= edit_book_languages(to_save['languages'], book)
+        except ValueError as e:
+            flash(str(e), category="error")
+            edit_error = True
+        # handle book ratings
+        modify_date |= edit_book_ratings(to_save, book)
+        # handle cc data
+        modify_date |= edit_all_cc_data(book_id, book, to_save)
+
+        if to_save.get("pubdate", None):
+            try:
+                book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
+            except ValueError as e:
+                book.pubdate = db.Books.DEFAULT_PUBDATE
+                flash(str(e), category="error")
+                edit_error = True
+        else:
+            book.pubdate = db.Books.DEFAULT_PUBDATE
+
+        if modify_date:
+            book.last_modified = datetime.utcnow()
+            kobo_sync_status.remove_synced_book(edited_books_id, all=True)
+
+        calibre_db.session.merge(book)
+        calibre_db.session.commit()
+        if config.config_use_google_drive:
+            gdriveutils.updateGdriveCalibreFromLocal()
+        if meta is not False \
+            and edit_error is not True \
+                and title_author_error is not True \
+                and cover_upload_success is not False:
+            flash(_("Metadata successfully updated"), category="success")
+        if "detail_view" in to_save:
+            return redirect(url_for('web.show_book', book_id=book.id))
+        else:
+            return render_edit_book(book_id)
+    except ValueError as e:
+        log.error_or_exception("Error: {}".format(e))
+        calibre_db.session.rollback()
+        flash(str(e), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
+    except (OperationalError, IntegrityError) as e:
+        log.error_or_exception("Database error: {}".format(e))
+        calibre_db.session.rollback()
+        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
+    except Exception as ex:
+        log.error_or_exception(ex)
+        calibre_db.session.rollback()
+        flash(_("Error editing book: {}".format(ex)), category="error")
+        return redirect(url_for('web.show_book', book_id=book.id))
+
+
+@editbook.route("/upload", methods=["POST"])
+@login_required_if_no_ano
+@upload_required
+def upload():
+    if not config.config_uploading:
+        abort(404)
+    if request.method == 'POST' and 'btn-upload' in request.files:
+        for requested_file in request.files.getlist("btn-upload"):
+            try:
+                modify_date = False
+                # create the function for sorting...
+                calibre_db.update_title_sort(config)
+                calibre_db.session.connection().connection.connection.create_function('uuid4', 0, lambda: str(uuid4()))
+
+                meta, error = file_handling_on_upload(requested_file)
+                if error:
+                    return error
+
+                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modify_date, meta)
+
+                # Comments need book id therefore only possible after flush
+                modify_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
+
+                book_id = db_book.id
+                title = db_book.title
+                if config.config_use_google_drive:
+                    helper.upload_new_file_gdrive(book_id,
+                                                  input_authors[0],
+                                                  renamed_authors,
+                                                  title,
+                                                  title_dir,
+                                                  meta.file_path,
+                                                  meta.extension.lower())
+                else:
+                    error = helper.update_dir_structure(book_id,
+                                                        config.config_calibre_dir,
+                                                        input_authors[0],
+                                                        meta.file_path,
+                                                        title_dir + meta.extension.lower(),
+                                                        renamed_author=renamed_authors)
+
+                move_coverfile(meta, db_book)
+
+                # save data to database, reread data
+                calibre_db.session.commit()
+
+                if config.config_use_google_drive:
+                    gdriveutils.updateGdriveCalibreFromLocal()
+                if error:
+                    flash(error, category="error")
+                link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
+                upload_text = N_(u"File %(file)s uploaded", file=link)
+                WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
+                helper.add_book_to_thumbnail_cache(book_id)
+
+                if len(request.files.getlist("btn-upload")) < 2:
+                    if current_user.role_edit() or current_user.role_admin():
+                        resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
+                        return Response(json.dumps(resp), mimetype='application/json')
+                    else:
+                        resp = {"location": url_for('web.show_book', book_id=book_id)}
+                        return Response(json.dumps(resp), mimetype='application/json')
+            except (OperationalError, IntegrityError) as e:
+                calibre_db.session.rollback()
+                log.error_or_exception("Database error: {}".format(e))
+                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
+        return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+
+
+@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
+@login_required_if_no_ano
+@edit_required
+def convert_bookformat(book_id):
+    # check to see if we have form fields to work with -  if not send user back
+    book_format_from = request.form.get('book_format_from', None)
+    book_format_to = request.form.get('book_format_to', None)
+
+    if (book_format_from is None) or (book_format_to is None):
+        flash(_(u"Source or destination format for conversion missing"), category="error")
+        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
+
+    log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
+    rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
+                                     book_format_to.upper(), current_user.name)
+
+    if rtn is None:
+        flash(_(u"Book successfully queued for converting to %(book_format)s",
+                book_format=book_format_to),
+              category="success")
+    else:
+        flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
+    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
+
+
+@editbook.route("/ajax/getcustomenum/<int:c_id>")
+@login_required
+def table_get_custom_enum(c_id):
+    ret = list()
+    cc = (calibre_db.session.query(db.CustomColumns)
+          .filter(db.CustomColumns.id == c_id)
+          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).one_or_none())
+    ret.append({'value': "", 'text': ""})
+    for idx, en in enumerate(cc.get_display_dict()['enum_values']):
+        ret.append({'value': en, 'text': en})
+    return json.dumps(ret)
+
+
+@editbook.route("/ajax/editbooks/<param>", methods=['POST'])
+@login_required_if_no_ano
+@edit_required
+def edit_list_book(param):
+    vals = request.form.to_dict()
+    book = calibre_db.get_book(vals['pk'])
+    sort_param = ""
+    ret = ""
+    try:
+        if param == 'series_index':
+            edit_book_series_index(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
+        elif param == 'tags':
+            edit_book_tags(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
+                           mimetype='application/json')
+        elif param == 'series':
+            edit_book_series(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
+                           mimetype='application/json')
+        elif param == 'publishers':
+            edit_book_publisher(vals['value'], book)
+            ret = Response(json.dumps({'success': True,
+                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
+                           mimetype='application/json')
+        elif param == 'languages':
+            invalid = list()
+            edit_book_languages(vals['value'], book, invalid=invalid)
+            if invalid:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
+                               mimetype='application/json')
+            else:
+                lang_names = list()
+                for lang in book.languages:
+                    lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
+                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
+                               mimetype='application/json')
+        elif param == 'author_sort':
+            book.author_sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
+                           mimetype='application/json')
+        elif param == 'title':
+            sort_param = book.sort
+            if handle_title_on_edit(book, vals.get('value', "")):
+                rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir)
+                if not rename_error:
+                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
+                                   mimetype='application/json')
+                else:
+                    ret = Response(json.dumps({'success': False,
+                                               'msg': rename_error}),
+                                   mimetype='application/json')
+        elif param == 'sort':
+            book.sort = vals['value']
+            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
+                           mimetype='application/json')
+        elif param == 'comments':
+            edit_book_comments(vals['value'], book)
+            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
+                           mimetype='application/json')
+        elif param == 'authors':
+            input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
+            rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0],
+                                                       renamed_author=renamed)
+            if not rename_error:
+                ret = Response(json.dumps({
+                    'success': True,
+                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
+                    mimetype='application/json')
+            else:
+                ret = Response(json.dumps({'success': False,
+                                           'msg': rename_error}),
+                               mimetype='application/json')
+        elif param == 'is_archived':
+            is_archived = change_archived_books(book.id, vals['value'] == "True",
+                                                message="Book {} archive bit set to: {}".format(book.id, vals['value']))
+            if is_archived:
+                kobo_sync_status.remove_synced_book(book.id)
+            return ""
+        elif param == 'read_status':
+            ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
+            if ret:
+                return ret, 400
+        elif param.startswith("custom_column_"):
+            new_val = dict()
+            new_val[param] = vals['value']
+            edit_single_cc_data(book.id, book, param[14:], new_val)
+            # ToDo: Very hacky find better solution
+            if vals['value'] in ["True", "False"]:
+                ret = ""
+            else:
+                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
+                               mimetype='application/json')
+        else:
+            return _("Parameter not found"), 400
+        book.last_modified = datetime.utcnow()
+
+        calibre_db.session.commit()
+        # revert change for sort if automatic fields link is deactivated
+        if param == 'title' and vals.get('checkT') == "false":
+            book.sort = sort_param
+            calibre_db.session.commit()
+    except (OperationalError, IntegrityError) as e:
+        calibre_db.session.rollback()
+        log.error_or_exception("Database error: {}".format(e))
+        ret = Response(json.dumps({'success': False,
+                                   'msg': 'Database error: {}'.format(e.orig)}),
+                       mimetype='application/json')
+    return ret
+
+
+@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
+@login_required
+def get_sorted_entry(field, bookid):
+    if field in ['title', 'authors', 'sort', 'author_sort']:
+        book = calibre_db.get_filtered_book(bookid)
+        if book:
+            if field == 'title':
+                return json.dumps({'sort': book.sort})
+            elif field == 'authors':
+                return json.dumps({'author_sort': book.author_sort})
+            if field == 'sort':
+                return json.dumps({'sort': book.title})
+            if field == 'author_sort':
+                return json.dumps({'author_sort': book.author})
+    return ""
+
+
+@editbook.route("/ajax/simulatemerge", methods=['POST'])
+@login_required
+@edit_required
+def simulate_merge_list_book():
+    vals = request.get_json().get('Merge_books')
+    if vals:
+        to_book = calibre_db.get_book(vals[0]).title
+        vals.pop(0)
+        if to_book:
+            from_book = []
+            for book_id in vals:
+                from_book.append(calibre_db.get_book(book_id).title)
+            return json.dumps({'to': to_book, 'from': from_book})
+    return ""
+
+
+@editbook.route("/ajax/mergebooks", methods=['POST'])
+@login_required
+@edit_required
+def merge_list_book():
+    vals = request.get_json().get('Merge_books')
+    to_file = list()
+    if vals:
+        # load all formats from target book
+        to_book = calibre_db.get_book(vals[0])
+        vals.pop(0)
+        if to_book:
+            for file in to_book.data:
+                to_file.append(file.format)
+            to_name = helper.get_valid_filename(to_book.title,
+                                                chars=96) + ' - ' + helper.get_valid_filename(to_book.authors[0].name,
+                                                                                              chars=96)
+            for book_id in vals:
+                from_book = calibre_db.get_book(book_id)
+                if from_book:
+                    for element in from_book.data:
+                        if element.format not in to_file:
+                            # create new data entry with: book_id, book_format, uncompressed_size, name
+                            filepath_new = os.path.normpath(os.path.join(config.config_calibre_dir,
+                                                                         to_book.path,
+                                                                         to_name + "." + element.format.lower()))
+                            filepath_old = os.path.normpath(os.path.join(config.config_calibre_dir,
+                                                                         from_book.path,
+                                                                         element.name + "." + element.format.lower()))
+                            copyfile(filepath_old, filepath_new)
+                            to_book.data.append(db.Data(to_book.id,
+                                                        element.format,
+                                                        element.uncompressed_size,
+                                                        to_name))
+                    delete_book_from_table(from_book.id, "", True)
+                    return json.dumps({'success': True})
+    return ""
+
+
+@editbook.route("/ajax/xchange", methods=['POST'])
+@login_required
+@edit_required
+def table_xchange_author_title():
+    vals = request.get_json().get('xchange')
+    edited_books_id = False
+    if vals:
+        for val in vals:
+            modify_date = False
+            book = calibre_db.get_book(val)
+            authors = book.title
+            book.authors = calibre_db.order_authors([book])
+            author_names = []
+            for authr in book.authors:
+                author_names.append(authr.name.replace('|', ','))
+
+            title_change = handle_title_on_edit(book, " ".join(author_names))
+            input_authors, author_change, renamed = handle_author_on_edit(book, authors)
+            if author_change or title_change:
+                edited_books_id = book.id
+                modify_date = True
+
+            if config.config_use_google_drive:
+                gdriveutils.updateGdriveCalibreFromLocal()
+
+            if edited_books_id:
+                # toDo: Handle error
+                edit_error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
+                                                         renamed_author=renamed)
+            if modify_date:
+                book.last_modified = datetime.utcnow()
+            try:
+                calibre_db.session.commit()
+            except (OperationalError, IntegrityError) as e:
+                calibre_db.session.rollback()
+                log.error_or_exception("Database error: %s", e)
+                return json.dumps({'success': False})
+
+            if config.config_use_google_drive:
+                gdriveutils.updateGdriveCalibreFromLocal()
+        return json.dumps({'success': True})
+    return ""
+
+
+def merge_metadata(to_save, meta):
+    if to_save.get('author_name', "") == _(u'Unknown'):
+        to_save['author_name'] = ''
+    if to_save.get('book_title', "") == _(u'Unknown'):
+        to_save['book_title'] = ''
+    for s_field, m_field in [
+            ('tags', 'tags'), ('author_name', 'author'), ('series', 'series'),
+            ('series_index', 'series_id'), ('languages', 'languages'),
+            ('book_title', 'title')]:
+        to_save[s_field] = to_save[s_field] or getattr(meta, m_field, '')
+    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
+
+
+def prepare_authors(authr):
+    # handle authors
+    input_authors = authr.split('&')
+    # handle_authors(input_authors)
+    input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
+    # Remove duplicates in authors list
+    input_authors = helper.uniq(input_authors)
+
+    # we have all author names now
+    if input_authors == ['']:
+        input_authors = [_(u'Unknown')]  # prevent empty Author
+
+    renamed = list()
+    for in_aut in input_authors:
+        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
+        if renamed_author and in_aut != renamed_author.name:
+            renamed.append(renamed_author.name)
+            all_books = calibre_db.session.query(db.Books) \
+                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
+            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
+            sorted_old_author = helper.get_sorted_author(in_aut)
+            for one_book in all_books:
+                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
+    return input_authors, renamed
+
+
+def prepare_authors_on_upload(title, authr):
+    if title != _(u'Unknown') and authr != _(u'Unknown'):
+        entry = calibre_db.check_exists_book(authr, title)
+        if entry:
+            log.info("Uploaded book probably exists in library")
+            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
+                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
+
+    input_authors, renamed = prepare_authors(authr)
+
+    sort_authors_list = list()
+    db_author = None
+    for inp in input_authors:
+        stored_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == inp).first()
+        if not stored_author:
+            if not db_author:
+                db_author = db.Authors(inp, helper.get_sorted_author(inp), "")
+                calibre_db.session.add(db_author)
+                calibre_db.session.commit()
+            sort_author = helper.get_sorted_author(inp)
+        else:
+            if not db_author:
+                db_author = stored_author
+            sort_author = stored_author.sort
+        sort_authors_list.append(sort_author)
+    sort_authors = ' & '.join(sort_authors_list)
+    return sort_authors, input_authors, db_author, renamed
+
+
+def create_book_on_upload(modify_date, meta):
+    title = meta.title
+    authr = meta.author
+    sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
+
+    title_dir = helper.get_valid_filename(title, chars=96)
+    author_dir = helper.get_valid_filename(db_author.name, chars=96)
+
+    # combine path and normalize path from Windows systems
+    path = os.path.join(author_dir, title_dir).replace('\\', '/')
+
+    try:
+        pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
+    except ValueError:
+        pubdate = datetime(101, 1, 1)
+
+    # Calibre adds books with utc as timezone
+    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), pubdate,
+                       '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
+
+    modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
+                                          'author')
+
+    # Add series_index to book
+    modify_date |= edit_book_series_index(meta.series_id, db_book)
+
+    # add languages
+    invalid = []
+    modify_date |= edit_book_languages(meta.languages, db_book, upload_mode=True, invalid=invalid)
+    if invalid:
+        for lang in invalid:
+            flash(_(u"'%(langname)s' is not a valid language", langname=lang), category="warning")
+
+    # handle tags
+    modify_date |= edit_book_tags(meta.tags, db_book)
+
+    # handle publisher
+    modify_date |= edit_book_publisher(meta.publisher, db_book)
+
+    # handle series
+    modify_date |= edit_book_series(meta.series, db_book)
+
+    # Add file to book
+    file_size = os.path.getsize(meta.file_path)
+    db_data = db.Data(db_book, meta.extension.upper()[1:], file_size, title_dir)
+    db_book.data.append(db_data)
+    calibre_db.session.add(db_book)
+
+    # flush content, get db_book.id available
+    calibre_db.session.flush()
+
+    # Handle identifiers now that db_book.id is available
+    identifier_list = []
+    for type_key, type_value in meta.identifiers:
+        identifier_list.append(db.Identifiers(type_value, type_key, db_book.id))
+    modification, warning = modify_identifiers(identifier_list, db_book.identifiers, calibre_db.session)
+    if warning:
+        flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
+    modify_date |= modification
+
+    return db_book, input_authors, title_dir, renamed_authors
+
+
+def file_handling_on_upload(requested_file):
+    # check if file extension is correct
+    if '.' in requested_file.filename:
+        file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
+        if file_ext not in constants.EXTENSIONS_UPLOAD and '' not in constants.EXTENSIONS_UPLOAD:
+            flash(
+                _("File extension '%(ext)s' is not allowed to be uploaded to this server",
+                  ext=file_ext), category="error")
+            return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+    else:
+        flash(_('File to be uploaded must have an extension'), category="error")
+        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+
+    # extract metadata from file
+    try:
+        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",
+                filename=requested_file.filename), category="error")
+        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+    return meta, None
+
+
+def move_coverfile(meta, db_book):
+    # move cover to final directory, including book id
+    if meta.cover:
+        cover_file = meta.cover
+    else:
+        cover_file = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
+    new_cover_path = os.path.join(config.config_calibre_dir, db_book.path)
+    try:
+        os.makedirs(new_cover_path, exist_ok=True)
+        copyfile(cover_file, os.path.join(new_cover_path, "cover.jpg"))
+        if meta.cover:
+            os.unlink(meta.cover)
+    except OSError as e:
+        log.error("Failed to move cover file %s: %s", new_cover_path, e)
+        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_cover_path,
+                error=e),
+              category="error")
+
+
 def delete_whole_book(book_id, book):
     # delete book from shelves, Downloads, Read list
     ub.session.query(ub.BookShelf).filter(ub.BookShelf.book_id == book_id).delete()
@@ -744,676 +1259,156 @@ def handle_author_on_edit(book, author_name, update_stored=True):
     return input_authors, change, renamed
 
 
-@editbook.route("/admin/book/<int:book_id>", methods=['GET'])
-@login_required_if_no_ano
-@edit_required
-def show_edit_book(book_id):
-    return render_edit_book(book_id)
+def search_objects_remove(db_book_object, db_type, input_elements):
+    del_elements = []
+    for c_elements in db_book_object:
+        found = False
+        if db_type == 'languages':
+            type_elements = c_elements.lang_code
+        elif db_type == 'custom':
+            type_elements = c_elements.value
+        else:
+            type_elements = c_elements.name
+        for inp_element in input_elements:
+            if inp_element.lower() == type_elements.lower():
+                found = True
+                break
+        # if the element was not found in the new list, add it to remove list
+        if not found:
+            del_elements.append(c_elements)
+    return del_elements
 
 
-@editbook.route("/admin/book/<int:book_id>", methods=['POST'])
-@login_required_if_no_ano
-@edit_required
-def edit_book(book_id):
-    modify_date = False
-    edit_error = False
-
-    # create the function for sorting...
-    #try:
-    calibre_db.update_title_sort(config)
-    #except sqliteOperationalError as e:
-    #    log.error_or_exception(e)
-    #    calibre_db.session.rollback()
-
-    book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-    # Book not found
-    if not book:
-        flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
-              category="error")
-        return redirect(url_for("web.index"))
-
-    to_save = request.form.to_dict()
-
-    try:
-        # Update folder of book on local disk
-        edited_books_id = None
-        title_author_error = None
-        # handle book title change
-        title_change = handle_title_on_edit(book, to_save["book_title"])
-        # handle book author change
-        input_authors, author_change, renamed = handle_author_on_edit(book, to_save["author_name"])
-        if author_change or title_change:
-            edited_books_id = book.id
-            modify_date = True
-            title_author_error = helper.update_dir_structure(edited_books_id,
-                                                             config.config_calibre_dir,
-                                                             input_authors[0],
-                                                             renamed_author=renamed)
-        if title_author_error:
-            flash(title_author_error, category="error")
-            calibre_db.session.rollback()
-            book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
-
-        # handle upload other formats from local disk
-        meta = upload_single_file(request, book, book_id)
-        # only merge metadata if file was uploaded and no error occurred (meta equals not false or none)
-        if meta:
-            merge_metadata(to_save, meta)
-        # handle upload covers from local disk
-        cover_upload_success = upload_cover(request, book)
-        if cover_upload_success:
-            book.has_cover = 1
-            modify_date = True
-
-        # upload new covers or new file formats to google drive
-        if config.config_use_google_drive:
-            gdriveutils.updateGdriveCalibreFromLocal()
-
-        if to_save.get("cover_url", None):
-            if not current_user.role_upload():
-                edit_error = True
-                flash(_(u"User has no rights to upload cover"), category="error")
-            if to_save["cover_url"].endswith('/static/generic_cover.jpg'):
-                book.has_cover = 0
+def search_objects_add(db_book_object, db_type, input_elements):
+    add_elements = []
+    for inp_element in input_elements:
+        found = False
+        for c_elements in db_book_object:
+            if db_type == 'languages':
+                type_elements = c_elements.lang_code
+            elif db_type == 'custom':
+                type_elements = c_elements.value
             else:
-                result, error = helper.save_cover_from_url(to_save["cover_url"].strip(), book.path)
-                if result is True:
-                    book.has_cover = 1
-                    modify_date = True
-                    helper.replace_cover_thumbnail_cache(book.id)
-                else:
-                    flash(error, category="error")
-
-        # Add default series_index to book
-        modify_date |= edit_book_series_index(to_save["series_index"], book)
-        # Handle book comments/description
-        modify_date |= edit_book_comments(Markup(to_save['description']).unescape(), book)
-        # Handle identifiers
-        input_identifiers = identifier_list(to_save, book)
-        modification, warning = modify_identifiers(input_identifiers, book.identifiers, calibre_db.session)
-        if warning:
-            flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-        modify_date |= modification
-        # Handle book tags
-        modify_date |= edit_book_tags(to_save['tags'], book)
-        # Handle book series
-        modify_date |= edit_book_series(to_save["series"], book)
-        # handle book publisher
-        modify_date |= edit_book_publisher(to_save['publisher'], book)
-        # handle book languages
-        try:
-            modify_date |= edit_book_languages(to_save['languages'], book)
-        except ValueError as e:
-            flash(str(e), category="error")
-            edit_error = True
-        # handle book ratings
-        modify_date |= edit_book_ratings(to_save, book)
-        # handle cc data
-        modify_date |= edit_all_cc_data(book_id, book, to_save)
-
-        if to_save.get("pubdate", None):
-            try:
-                book.pubdate = datetime.strptime(to_save["pubdate"], "%Y-%m-%d")
-            except ValueError as e:
-                book.pubdate = db.Books.DEFAULT_PUBDATE
-                flash(str(e), category="error")
-                edit_error = True
-        else:
-            book.pubdate = db.Books.DEFAULT_PUBDATE
-
-        if modify_date:
-            book.last_modified = datetime.utcnow()
-            kobo_sync_status.remove_synced_book(edited_books_id, all=True)
-
-        calibre_db.session.merge(book)
-        calibre_db.session.commit()
-        if config.config_use_google_drive:
-            gdriveutils.updateGdriveCalibreFromLocal()
-        if meta is not False \
-            and edit_error is not True \
-                and title_author_error is not True \
-                and cover_upload_success is not False:
-            flash(_("Metadata successfully updated"), category="success")
-        if "detail_view" in to_save:
-            return redirect(url_for('web.show_book', book_id=book.id))
-        else:
-            return render_edit_book(book_id)
-    except ValueError as e:
-        log.error_or_exception("Error: {}".format(e))
-        calibre_db.session.rollback()
-        flash(str(e), category="error")
-        return redirect(url_for('web.show_book', book_id=book.id))
-    except (OperationalError, IntegrityError) as e:
-        log.error_or_exception("Database error: {}".format(e))
-        calibre_db.session.rollback()
-        flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-        return redirect(url_for('web.show_book', book_id=book.id))
-    except Exception as ex:
-        log.error_or_exception(ex)
-        calibre_db.session.rollback()
-        flash(_("Error editing book: {}".format(ex)), category="error")
-        return redirect(url_for('web.show_book', book_id=book.id))
+                type_elements = c_elements.name
+            if inp_element == type_elements:
+                found = True
+                break
+        if not found:
+            add_elements.append(inp_element)
+    return add_elements
 
 
-def merge_metadata(to_save, meta):
-    if to_save.get('author_name', "") == _(u'Unknown'):
-        to_save['author_name'] = ''
-    if to_save.get('book_title', "") == _(u'Unknown'):
-        to_save['book_title'] = ''
-    for s_field, m_field in [
-            ('tags', 'tags'), ('author_name', 'author'), ('series', 'series'),
-            ('series_index', 'series_id'), ('languages', 'languages'),
-            ('book_title', 'title')]:
-        to_save[s_field] = to_save[s_field] or getattr(meta, m_field, '')
-    to_save["description"] = to_save["description"] or Markup(
-        getattr(meta, 'description', '')).unescape()
+def remove_objects(db_book_object, db_session, del_elements):
+    changed = False
+    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)
+    return changed
 
 
-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
-
-
-def prepare_authors(authr):
-    # handle authors
-    input_authors = authr.split('&')
-    # handle_authors(input_authors)
-    input_authors = list(map(lambda it: it.strip().replace(',', '|'), input_authors))
-    # Remove duplicates in authors list
-    input_authors = helper.uniq(input_authors)
-
-    # we have all author names now
-    if input_authors == ['']:
-        input_authors = [_(u'Unknown')]  # prevent empty Author
-
-    renamed = list()
-    for in_aut in input_authors:
-        renamed_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == in_aut).first()
-        if renamed_author and in_aut != renamed_author.name:
-            renamed.append(renamed_author.name)
-            all_books = calibre_db.session.query(db.Books) \
-                .filter(db.Books.authors.any(db.Authors.name == renamed_author.name)).all()
-            sorted_renamed_author = helper.get_sorted_author(renamed_author.name)
-            sorted_old_author = helper.get_sorted_author(in_aut)
-            for one_book in all_books:
-                one_book.author_sort = one_book.author_sort.replace(sorted_renamed_author, sorted_old_author)
-    return input_authors, renamed
-
-
-def prepare_authors_on_upload(title, authr):
-    if title != _(u'Unknown') and authr != _(u'Unknown'):
-        entry = calibre_db.check_exists_book(authr, title)
-        if entry:
-            log.info("Uploaded book probably exists in library")
-            flash(_(u"Uploaded book probably exists in the library, consider to change before upload new: ")
-                  + Markup(render_title_template('book_exists_flash.html', entry=entry)), category="warning")
-
-    input_authors, renamed = prepare_authors(authr)
-
-    sort_authors_list = list()
-    db_author = None
-    for inp in input_authors:
-        stored_author = calibre_db.session.query(db.Authors).filter(db.Authors.name == inp).first()
-        if not stored_author:
-            if not db_author:
-                db_author = db.Authors(inp, helper.get_sorted_author(inp), "")
-                calibre_db.session.add(db_author)
-                calibre_db.session.commit()
-            sort_author = helper.get_sorted_author(inp)
-        else:
-            if not db_author:
-                db_author = stored_author
-            sort_author = stored_author.sort
-        sort_authors_list.append(sort_author)
-    sort_authors = ' & '.join(sort_authors_list)
-    return sort_authors, input_authors, db_author, renamed
-
-
-def create_book_on_upload(modify_date, meta):
-    title = meta.title
-    authr = meta.author
-    sort_authors, input_authors, db_author, renamed_authors = prepare_authors_on_upload(title, authr)
-
-    title_dir = helper.get_valid_filename(title, chars=96)
-    author_dir = helper.get_valid_filename(db_author.name, chars=96)
-
-    # combine path and normalize path from Windows systems
-    path = os.path.join(author_dir, title_dir).replace('\\', '/')
-
-    try:
-        pubdate = datetime.strptime(meta.pubdate[:10], "%Y-%m-%d")
-    except ValueError:
-        pubdate = datetime(101, 1, 1)
-
-    # Calibre adds books with utc as timezone
-    db_book = db.Books(title, "", sort_authors, datetime.utcnow(), pubdate,
-                       '1', datetime.utcnow(), path, meta.cover, db_author, [], "")
-
-    modify_date |= modify_database_object(input_authors, db_book.authors, db.Authors, calibre_db.session,
-                                          'author')
-
-    # Add series_index to book
-    modify_date |= edit_book_series_index(meta.series_id, db_book)
-
-    # add languages
-    invalid = []
-    modify_date |= edit_book_languages(meta.languages, db_book, upload_mode=True, invalid=invalid)
-    if invalid:
-        for lang in invalid:
-            flash(_(u"'%(langname)s' is not a valid language", langname=lang), category="warning")
-
-    # handle tags
-    modify_date |= edit_book_tags(meta.tags, db_book)
-
-    # handle publisher
-    modify_date |= edit_book_publisher(meta.publisher, db_book)
-
-    # handle series
-    modify_date |= edit_book_series(meta.series, db_book)
-
-    # Add file to book
-    file_size = os.path.getsize(meta.file_path)
-    db_data = db.Data(db_book, meta.extension.upper()[1:], file_size, title_dir)
-    db_book.data.append(db_data)
-    calibre_db.session.add(db_book)
-
-    # flush content, get db_book.id available
-    calibre_db.session.flush()
-
-    # Handle identifiers now that db_book.id is available
-    identifier_list = []
-    for type_key, type_value in meta.identifiers:
-        identifier_list.append(db.Identifiers(type_value, type_key, db_book.id))
-    modification, warning = modify_identifiers(identifier_list, db_book.identifiers, calibre_db.session)
-    if warning:
-        flash(_("Identifiers are not Case Sensitive, Overwriting Old Identifier"), category="warning")
-    modify_date |= modification
-
-    return db_book, input_authors, title_dir, renamed_authors
-
-
-def file_handling_on_upload(requested_file):
-    # check if file extension is correct
-    if '.' in requested_file.filename:
-        file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
-        if file_ext not in constants.EXTENSIONS_UPLOAD and '' not in constants.EXTENSIONS_UPLOAD:
-            flash(
-                _("File extension '%(ext)s' is not allowed to be uploaded to this server",
-                  ext=file_ext), category="error")
-            return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
+def add_objects(db_book_object, db_object, db_session, db_type, add_elements):
+    changed = False
+    if db_type == 'languages':
+        db_filter = db_object.lang_code
+    elif db_type == 'custom':
+        db_filter = db_object.value
     else:
-        flash(_('File to be uploaded must have an extension'), category="error")
-        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-
-    # extract metadata from file
-    try:
-        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",
-                filename=requested_file.filename), category="error")
-        return None, Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-    return meta, None
-
-
-def move_coverfile(meta, db_book):
-    # move cover to final directory, including book id
-    if meta.cover:
-        cover_file = meta.cover
-    else:
-        cover_file = os.path.join(constants.STATIC_DIR, 'generic_cover.jpg')
-    new_cover_path = os.path.join(config.config_calibre_dir, db_book.path)
-    try:
-        os.makedirs(new_cover_path, exist_ok=True)
-        copyfile(cover_file, os.path.join(new_cover_path, "cover.jpg"))
-        if meta.cover:
-            os.unlink(meta.cover)
-    except OSError as e:
-        log.error("Failed to move cover file %s: %s", new_cover_path, e)
-        flash(_(u"Failed to Move Cover File %(file)s: %(error)s", file=new_cover_path,
-                error=e),
-              category="error")
-
-
-@editbook.route("/upload", methods=["POST"])
-@login_required_if_no_ano
-@upload_required
-def upload():
-    if not config.config_uploading:
-        abort(404)
-    if request.method == 'POST' and 'btn-upload' in request.files:
-        for requested_file in request.files.getlist("btn-upload"):
-            try:
-                modify_date = False
-                # create the function for sorting...
-                calibre_db.update_title_sort(config)
-                calibre_db.session.connection().connection.connection.create_function('uuid4', 0, lambda: str(uuid4()))
-
-                meta, error = file_handling_on_upload(requested_file)
-                if error:
-                    return error
-
-                db_book, input_authors, title_dir, renamed_authors = create_book_on_upload(modify_date, meta)
-
-                # Comments need book id therefore only possible after flush
-                modify_date |= edit_book_comments(Markup(meta.description).unescape(), db_book)
-
-                book_id = db_book.id
-                title = db_book.title
-                if config.config_use_google_drive:
-                    helper.upload_new_file_gdrive(book_id,
-                                                  input_authors[0],
-                                                  renamed_authors,
-                                                  title,
-                                                  title_dir,
-                                                  meta.file_path,
-                                                  meta.extension.lower())
-                else:
-                    error = helper.update_dir_structure(book_id,
-                                                        config.config_calibre_dir,
-                                                        input_authors[0],
-                                                        meta.file_path,
-                                                        title_dir + meta.extension.lower(),
-                                                        renamed_author=renamed_authors)
-
-                move_coverfile(meta, db_book)
-
-                # save data to database, reread data
-                calibre_db.session.commit()
-
-                if config.config_use_google_drive:
-                    gdriveutils.updateGdriveCalibreFromLocal()
-                if error:
-                    flash(error, category="error")
-                link = '<a href="{}">{}</a>'.format(url_for('web.show_book', book_id=book_id), escape(title))
-                upload_text = N_(u"File %(file)s uploaded", file=link)
-                WorkerThread.add(current_user.name, TaskUpload(upload_text, escape(title)))
-                helper.add_book_to_thumbnail_cache(book_id)
-
-                if len(request.files.getlist("btn-upload")) < 2:
-                    if current_user.role_edit() or current_user.role_admin():
-                        resp = {"location": url_for('edit-book.show_edit_book', book_id=book_id)}
-                        return Response(json.dumps(resp), mimetype='application/json')
-                    else:
-                        resp = {"location": url_for('web.show_book', book_id=book_id)}
-                        return Response(json.dumps(resp), mimetype='application/json')
-            except (OperationalError, IntegrityError) as e:
-                calibre_db.session.rollback()
-                log.error_or_exception("Database error: {}".format(e))
-                flash(_(u"Database error: %(error)s.", error=e.orig), category="error")
-        return Response(json.dumps({"location": url_for("web.index")}), mimetype='application/json')
-
-
-@editbook.route("/admin/book/convert/<int:book_id>", methods=['POST'])
-@login_required_if_no_ano
-@edit_required
-def convert_bookformat(book_id):
-    # check to see if we have form fields to work with -  if not send user back
-    book_format_from = request.form.get('book_format_from', None)
-    book_format_to = request.form.get('book_format_to', None)
-
-    if (book_format_from is None) or (book_format_to is None):
-        flash(_(u"Source or destination format for conversion missing"), category="error")
-        return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
-
-    log.info('converting: book id: %s from: %s to: %s', book_id, book_format_from, book_format_to)
-    rtn = helper.convert_book_format(book_id, config.config_calibre_dir, book_format_from.upper(),
-                                     book_format_to.upper(), current_user.name)
-
-    if rtn is None:
-        flash(_(u"Book successfully queued for converting to %(book_format)s",
-                book_format=book_format_to),
-              category="success")
-    else:
-        flash(_(u"There was an error converting this book: %(res)s", res=rtn), category="error")
-    return redirect(url_for('edit-book.show_edit_book', book_id=book_id))
-
-
-@editbook.route("/ajax/getcustomenum/<int:c_id>")
-@login_required
-def table_get_custom_enum(c_id):
-    ret = list()
-    cc = (calibre_db.session.query(db.CustomColumns)
-          .filter(db.CustomColumns.id == c_id)
-          .filter(db.CustomColumns.datatype.notin_(db.cc_exceptions)).one_or_none())
-    ret.append({'value': "", 'text': ""})
-    for idx, en in enumerate(cc.get_display_dict()['enum_values']):
-        ret.append({'value': en, 'text': en})
-    return json.dumps(ret)
-
-
-@editbook.route("/ajax/editbooks/<param>", methods=['POST'])
-@login_required_if_no_ano
-@edit_required
-def edit_list_book(param):
-    vals = request.form.to_dict()
-    book = calibre_db.get_book(vals['pk'])
-    sort_param = ""
-    ret = ""
-    try:
-        if param == 'series_index':
-            edit_book_series_index(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue': book.series_index}), mimetype='application/json')
-        elif param == 'tags':
-            edit_book_tags(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue': ', '.join([tag.name for tag in book.tags])}),
-                           mimetype='application/json')
-        elif param == 'series':
-            edit_book_series(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue':  ', '.join([serie.name for serie in book.series])}),
-                           mimetype='application/json')
-        elif param == 'publishers':
-            edit_book_publisher(vals['value'], book)
-            ret = Response(json.dumps({'success': True,
-                                       'newValue': ', '.join([publisher.name for publisher in book.publishers])}),
-                           mimetype='application/json')
-        elif param == 'languages':
-            invalid = list()
-            edit_book_languages(vals['value'], book, invalid=invalid)
-            if invalid:
-                ret = Response(json.dumps({'success': False,
-                                           'msg': 'Invalid languages in request: {}'.format(','.join(invalid))}),
-                               mimetype='application/json')
-            else:
-                lang_names = list()
-                for lang in book.languages:
-                    lang_names.append(isoLanguages.get_language_name(get_locale(), lang.lang_code))
-                ret = Response(json.dumps({'success': True, 'newValue':  ', '.join(lang_names)}),
-                               mimetype='application/json')
-        elif param == 'author_sort':
-            book.author_sort = vals['value']
-            ret = Response(json.dumps({'success': True, 'newValue':  book.author_sort}),
-                           mimetype='application/json')
-        elif param == 'title':
-            sort_param = book.sort
-            if handle_title_on_edit(book, vals.get('value', "")):
-                rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir)
-                if not rename_error:
-                    ret = Response(json.dumps({'success': True, 'newValue':  book.title}),
-                                   mimetype='application/json')
-                else:
-                    ret = Response(json.dumps({'success': False,
-                                               'msg': rename_error}),
-                                   mimetype='application/json')
-        elif param == 'sort':
-            book.sort = vals['value']
-            ret = Response(json.dumps({'success': True, 'newValue':  book.sort}),
-                           mimetype='application/json')
-        elif param == 'comments':
-            edit_book_comments(vals['value'], book)
-            ret = Response(json.dumps({'success': True, 'newValue':  book.comments[0].text}),
-                           mimetype='application/json')
-        elif param == 'authors':
-            input_authors, __, renamed = handle_author_on_edit(book, vals['value'], vals.get('checkA', None) == "true")
-            rename_error = helper.update_dir_structure(book.id, config.config_calibre_dir, input_authors[0],
-                                                       renamed_author=renamed)
-            if not rename_error:
-                ret = Response(json.dumps({
-                    'success': True,
-                    'newValue':  ' & '.join([author.replace('|', ',') for author in input_authors])}),
-                    mimetype='application/json')
-            else:
-                ret = Response(json.dumps({'success': False,
-                                           'msg': rename_error}),
-                               mimetype='application/json')
-        elif param == 'is_archived':
-            is_archived = change_archived_books(book.id, vals['value'] == "True",
-                                                message="Book {} archive bit set to: {}".format(book.id, vals['value']))
-            if is_archived:
-                kobo_sync_status.remove_synced_book(book.id)
-            return ""
-        elif param == 'read_status':
-            ret = helper.edit_book_read_status(book.id, vals['value'] == "True")
-            if ret:
-                return ret, 400
-        elif param.startswith("custom_column_"):
-            new_val = dict()
-            new_val[param] = vals['value']
-            edit_single_cc_data(book.id, book, param[14:], new_val)
-            # ToDo: Very hacky find better solution
-            if vals['value'] in ["True", "False"]:
-                ret = ""
-            else:
-                ret = Response(json.dumps({'success': True, 'newValue': vals['value']}),
-                               mimetype='application/json')
+        db_filter = db_object.name
+    for add_element in add_elements:
+        # check if an element with that name exists
+        db_element = db_session.query(db_object).filter(db_filter == add_element).first()
+        # if no element is found add it
+        if db_type == 'author':
+            new_element = db_object(add_element, helper.get_sorted_author(add_element.replace('|', ',')), "")
+        elif db_type == 'series':
+            new_element = db_object(add_element, add_element)
+        elif db_type == 'custom':
+            new_element = db_object(value=add_element)
+        elif db_type == 'publisher':
+            new_element = db_object(add_element, None)
+        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:
-            return _("Parameter not found"), 400
-        book.last_modified = datetime.utcnow()
-
-        calibre_db.session.commit()
-        # revert change for sort if automatic fields link is deactivated
-        if param == 'title' and vals.get('checkT') == "false":
-            book.sort = sort_param
-            calibre_db.session.commit()
-    except (OperationalError, IntegrityError) as e:
-        calibre_db.session.rollback()
-        log.error_or_exception("Database error: {}".format(e))
-        ret = Response(json.dumps({'success': False,
-                                   'msg': 'Database error: {}'.format(e.orig)}),
-                       mimetype='application/json')
-    return ret
+            db_element = create_objects_for_addition(db_element, add_element, db_type)
+            # add element to book
+            changed = True
+            db_book_object.append(db_element)
+    return changed
 
 
-@editbook.route("/ajax/sort_value/<field>/<int:bookid>")
-@login_required
-def get_sorted_entry(field, bookid):
-    if field in ['title', 'authors', 'sort', 'author_sort']:
-        book = calibre_db.get_filtered_book(bookid)
-        if book:
-            if field == 'title':
-                return json.dumps({'sort': book.sort})
-            elif field == 'authors':
-                return json.dumps({'author_sort': book.author_sort})
-            if field == 'sort':
-                return json.dumps({'sort': book.title})
-            if field == 'author_sort':
-                return json.dumps({'author_sort': book.author})
-    return ""
+def create_objects_for_addition(db_element, add_element, db_type):
+    if db_type == 'custom':
+        if db_element.value != add_element:
+            db_element.value = add_element
+    elif db_type == 'languages':
+        if db_element.lang_code != add_element:
+            db_element.lang_code = add_element
+    elif db_type == 'series':
+        if db_element.name != add_element:
+            db_element.name = add_element
+            db_element.sort = add_element
+    elif db_type == 'author':
+        if db_element.name != add_element:
+            db_element.name = add_element
+            db_element.sort = helper.get_sorted_author(add_element.replace('|', ','))
+    elif db_type == 'publisher':
+        if db_element.name != add_element:
+            db_element.name = add_element
+            db_element.sort = None
+    elif db_element.name != add_element:
+        db_element.name = add_element
+    return db_element
 
 
-@editbook.route("/ajax/simulatemerge", methods=['POST'])
-@login_required
-@edit_required
-def simulate_merge_list_book():
-    vals = request.get_json().get('Merge_books')
-    if vals:
-        to_book = calibre_db.get_book(vals[0]).title
-        vals.pop(0)
-        if to_book:
-            from_book = []
-            for book_id in vals:
-                from_book.append(calibre_db.get_book(book_id).title)
-            return json.dumps({'to': to_book, 'from': from_book})
-    return ""
+# Modifies different Database objects, first check if elements have to be deleted,
+# because they are no longer used, than check if elements have to be added to database
+def modify_database_object(input_elements, db_book_object, db_object, db_session, db_type):
+    # 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")
+    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
+    del_elements = search_objects_remove(db_book_object, db_type, input_elements)
+    # 2. search for elements that need to be added
+    add_elements = search_objects_add(db_book_object, db_type, input_elements)
+    # if there are elements to remove, we remove them now
+    changed = remove_objects(db_book_object, db_session, del_elements)
+    # if there are elements to add, we add them now!
+    if len(add_elements) > 0:
+        changed |= add_objects(db_book_object, db_object, db_session, db_type, add_elements)
+    return changed
 
 
-@editbook.route("/ajax/mergebooks", methods=['POST'])
-@login_required
-@edit_required
-def merge_list_book():
-    vals = request.get_json().get('Merge_books')
-    to_file = list()
-    if vals:
-        # load all formats from target book
-        to_book = calibre_db.get_book(vals[0])
-        vals.pop(0)
-        if to_book:
-            for file in to_book.data:
-                to_file.append(file.format)
-            to_name = helper.get_valid_filename(to_book.title,
-                                                chars=96) + ' - ' + helper.get_valid_filename(to_book.authors[0].name,
-                                                                                              chars=96)
-            for book_id in vals:
-                from_book = calibre_db.get_book(book_id)
-                if from_book:
-                    for element in from_book.data:
-                        if element.format not in to_file:
-                            # create new data entry with: book_id, book_format, uncompressed_size, name
-                            filepath_new = os.path.normpath(os.path.join(config.config_calibre_dir,
-                                                                         to_book.path,
-                                                                         to_name + "." + element.format.lower()))
-                            filepath_old = os.path.normpath(os.path.join(config.config_calibre_dir,
-                                                                         from_book.path,
-                                                                         element.name + "." + element.format.lower()))
-                            copyfile(filepath_old, filepath_new)
-                            to_book.data.append(db.Data(to_book.id,
-                                                        element.format,
-                                                        element.uncompressed_size,
-                                                        to_name))
-                    delete_book_from_table(from_book.id, "", True)
-                    return json.dumps({'success': True})
-    return ""
-
-
-@editbook.route("/ajax/xchange", methods=['POST'])
-@login_required
-@edit_required
-def table_xchange_author_title():
-    vals = request.get_json().get('xchange')
-    edited_books_id = False
-    if vals:
-        for val in vals:
-            modify_date = False
-            book = calibre_db.get_book(val)
-            authors = book.title
-            book.authors = calibre_db.order_authors([book])
-            author_names = []
-            for authr in book.authors:
-                author_names.append(authr.name.replace('|', ','))
-
-            title_change = handle_title_on_edit(book, " ".join(author_names))
-            input_authors, author_change, renamed = handle_author_on_edit(book, authors)
-            if author_change or title_change:
-                edited_books_id = book.id
-                modify_date = True
-
-            if config.config_use_google_drive:
-                gdriveutils.updateGdriveCalibreFromLocal()
-
-            if edited_books_id:
-                # toDo: Handle error
-                edit_error = helper.update_dir_structure(edited_books_id, config.config_calibre_dir, input_authors[0],
-                                                         renamed_author=renamed)
-            if modify_date:
-                book.last_modified = datetime.utcnow()
-            try:
-                calibre_db.session.commit()
-            except (OperationalError, IntegrityError) as e:
-                calibre_db.session.rollback()
-                log.error_or_exception("Database error: %s", e)
-                return json.dumps({'success': False})
-
-            if config.config_use_google_drive:
-                gdriveutils.updateGdriveCalibreFromLocal()
-        return json.dumps({'success': True})
-    return ""
+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
+    error = False
+    input_dict = dict([(identifier.type.lower(), identifier) for identifier in input_identifiers])
+    if len(input_identifiers) != len(input_dict):
+        error = True
+    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
+            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)
+            changed = True
+    return changed, error
diff --git a/cps/helper.py b/cps/helper.py
index aec14668..7c76d180 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -29,11 +29,9 @@ from tempfile import gettempdir
 import requests
 import unidecode
 
-
 from flask import send_from_directory, make_response, redirect, abort, url_for
 from flask_babel import gettext as _
 from flask_babel import lazy_gettext as N_
-from flask_babel import format_datetime, get_locale
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, or_, text, func
 from sqlalchemy.exc import InvalidRequestError, OperationalError
@@ -42,7 +40,6 @@ from werkzeug.security import generate_password_hash
 from markupsafe import escape
 from urllib.parse import quote
 
-
 try:
     import advocate
     from advocate.exceptions import UnacceptableAddressException
@@ -52,14 +49,13 @@ except ImportError:
     advocate = requests
     UnacceptableAddressException = MissingSchema = BaseException
 
-from . import calibre_db, cli
+from . import calibre_db, cli_param
 from .tasks.convert import TaskConvert
 from . import logger, config, db, ub, fs
 from . import gdriveutils as gd
 from .constants import STATIC_DIR as _STATIC_DIR, CACHE_TYPE_THUMBNAILS, THUMBNAIL_TYPE_COVER, THUMBNAIL_TYPE_SERIES
 from .subproc_wrapper import process_wait
-from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
-    STAT_CANCELLED
+from .services.worker import WorkerThread
 from .tasks.mail import TaskEmail
 from .tasks.thumbnail import TaskClearCoverThumbnailCache, TaskGenerateCoverThumbnails
 
@@ -76,10 +72,10 @@ except (ImportError, RuntimeError) as e:
 
 
 # Convert existing book entry to new format
-def convert_book_format(book_id, calibrepath, old_book_format, new_book_format, user_id, kindle_mail=None):
+def convert_book_format(book_id, calibre_path, old_book_format, new_book_format, user_id, kindle_mail=None):
     book = calibre_db.get_book(book_id)
     data = calibre_db.get_book_format(book.id, old_book_format)
-    file_path = os.path.join(calibrepath, book.path, data.name)
+    file_path = os.path.join(calibre_path, book.path, data.name)
     if not data:
         error_message = _(u"%(format)s format not found for book id: %(book)d", format=old_book_format, book=book_id)
         log.error("convert_book_format: %s", error_message)
@@ -144,20 +140,20 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
 
 
 def check_send_to_kindle_with_converter(formats):
-    bookformats = list()
+    book_formats = list()
     if 'EPUB' in formats and 'MOBI' not in formats:
-        bookformats.append({'format': 'Mobi',
-                            'convert': 1,
-                            'text': _('Convert %(orig)s to %(format)s and send to Kindle',
-                                      orig='Epub',
-                                      format='Mobi')})
+        book_formats.append({'format': 'Mobi',
+                             'convert': 1,
+                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
+                                       orig='Epub',
+                                       format='Mobi')})
     if 'AZW3' in formats and 'MOBI' not in formats:
-        bookformats.append({'format': 'Mobi',
-                            'convert': 2,
-                            'text': _('Convert %(orig)s to %(format)s and send to Kindle',
-                                      orig='Azw3',
-                                      format='Mobi')})
-    return bookformats
+        book_formats.append({'format': 'Mobi',
+                             'convert': 2,
+                             'text': _('Convert %(orig)s to %(format)s and send to Kindle',
+                                       orig='Azw3',
+                                       format='Mobi')})
+    return book_formats
 
 
 def check_send_to_kindle(entry):
@@ -165,26 +161,26 @@ def check_send_to_kindle(entry):
         returns all available book formats for sending to Kindle
     """
     formats = list()
-    bookformats = list()
+    book_formats = list()
     if len(entry.data):
         for ele in iter(entry.data):
             if ele.uncompressed_size < config.mail_size:
                 formats.append(ele.format)
         if 'MOBI' in formats:
-            bookformats.append({'format': 'Mobi',
-                                'convert': 0,
-                                'text': _('Send %(format)s to Kindle', format='Mobi')})
+            book_formats.append({'format': 'Mobi',
+                                 'convert': 0,
+                                 'text': _('Send %(format)s to Kindle', format='Mobi')})
         if 'PDF' in formats:
-            bookformats.append({'format': 'Pdf',
-                                'convert': 0,
-                                'text': _('Send %(format)s to Kindle', format='Pdf')})
+            book_formats.append({'format': 'Pdf',
+                                 'convert': 0,
+                                 'text': _('Send %(format)s to Kindle', format='Pdf')})
         if 'AZW' in formats:
-            bookformats.append({'format': 'Azw',
-                                'convert': 0,
-                                'text': _('Send %(format)s to Kindle', format='Azw')})
+            book_formats.append({'format': 'Azw',
+                                 'convert': 0,
+                                 'text': _('Send %(format)s to Kindle', format='Azw')})
         if config.config_converterpath:
-            bookformats.extend(check_send_to_kindle_with_converter(formats))
-        return bookformats
+            book_formats.extend(check_send_to_kindle_with_converter(formats))
+        return book_formats
     else:
         log.error(u'Cannot find book entry %d', entry.id)
         return None
@@ -194,12 +190,12 @@ def check_send_to_kindle(entry):
 # list with supported formats
 def check_read_formats(entry):
     extensions_reader = {'TXT', 'PDF', 'EPUB', 'CBZ', 'CBT', 'CBR', 'DJVU'}
-    bookformats = list()
+    book_formats = list()
     if len(entry.data):
         for ele in iter(entry.data):
             if ele.format.upper() in extensions_reader:
-                bookformats.append(ele.format.lower())
-    return bookformats
+                book_formats.append(ele.format.lower())
+    return book_formats
 
 
 # Files are processed in the following order/priority:
@@ -229,23 +225,11 @@ def send_mail(book_id, book_format, convert, kindle_mail, calibrepath, user_id):
     return _(u"The requested file could not be read. Maybe wrong permissions?")
 
 
-def shorten_component(s, by_what):
-    l = len(s)
-    if l < by_what:
-        return s
-    l = (l - by_what)//2
-    if l <= 0:
-        return s
-    return s[:l] + s[-l:]
-
-
 def get_valid_filename(value, replace_whitespace=True, chars=128):
     """
     Returns the given string converted to a string that can be used for a clean
     filename. Limits num characters to 128 max.
     """
-
-
     if value[-1:] == u'.':
         value = value[:-1]+u'_'
     value = value.replace("/", "_").replace(":", "_").strip('\0')
@@ -814,7 +798,7 @@ def get_series_thumbnail(series_id, resolution):
 # saves book cover from url
 def save_cover_from_url(url, book_path):
     try:
-        if cli.allow_localhost:
+        if cli_param.allow_localhost:
             img = requests.get(url, timeout=(10, 200), allow_redirects=False)  # ToDo: Error Handling
         elif use_advocate:
             img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index 5668e6da..9865b993 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -71,47 +71,8 @@ from flask_babel import gettext as _
 from . import logger, config, calibre_db, db, helper, ub, lm
 from .render_template import render_title_template
 
-
 log = logger.create()
 
-
-def register_url_value_preprocessor(kobo):
-    @kobo.url_value_preprocessor
-    # pylint: disable=unused-variable
-    def pop_auth_token(__, values):
-        g.auth_token = values.pop("auth_token")
-
-
-def disable_failed_auth_redirect_for_blueprint(bp):
-    lm.blueprint_login_views[bp.name] = None
-
-
-def get_auth_token():
-    if "auth_token" in g:
-        return g.get("auth_token")
-    else:
-        return None
-
-
-def requires_kobo_auth(f):
-    @wraps(f)
-    def inner(*args, **kwargs):
-        auth_token = get_auth_token()
-        if auth_token is not None:
-            user = (
-                ub.session.query(ub.User)
-                .join(ub.RemoteAuthToken)
-                .filter(ub.RemoteAuthToken.auth_token == auth_token).filter(ub.RemoteAuthToken.token_type==1)
-                .first()
-            )
-            if user is not None:
-                login_user(user)
-                return f(*args, **kwargs)
-            log.debug("Received Kobo request without a recognizable auth token.")
-            return abort(401)
-    return inner
-
-
 kobo_auth = Blueprint("kobo_auth", __name__, url_prefix="/kobo_auth")
 
 
@@ -165,3 +126,40 @@ def delete_auth_token(user_id):
         .filter(ub.RemoteAuthToken.token_type==1).delete()
 
     return ub.session_commit()
+
+
+def disable_failed_auth_redirect_for_blueprint(bp):
+    lm.blueprint_login_views[bp.name] = None
+
+
+def get_auth_token():
+    if "auth_token" in g:
+        return g.get("auth_token")
+    else:
+        return None
+
+
+def register_url_value_preprocessor(kobo):
+    @kobo.url_value_preprocessor
+    # pylint: disable=unused-variable
+    def pop_auth_token(__, values):
+        g.auth_token = values.pop("auth_token")
+
+
+def requires_kobo_auth(f):
+    @wraps(f)
+    def inner(*args, **kwargs):
+        auth_token = get_auth_token()
+        if auth_token is not None:
+            user = (
+                ub.session.query(ub.User)
+                .join(ub.RemoteAuthToken)
+                .filter(ub.RemoteAuthToken.auth_token == auth_token).filter(ub.RemoteAuthToken.token_type==1)
+                .first()
+            )
+            if user is not None:
+                login_user(user)
+                return f(*args, **kwargs)
+            log.debug("Received Kobo request without a recognizable auth token.")
+            return abort(401)
+    return inner
diff --git a/cps/main.py b/cps/main.py
index 304a244a..ccf03c15 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -20,11 +20,7 @@ import sys
 
 from . import create_app
 from .jinjia import jinjia
-from .shelf import shelf
 from .remotelogin import remotelogin
-from .search_metadata import meta
-from .error_handler import init_errorhandler
-from .tasks_status import tasks
 
 try:
     from kobo import kobo, get_kobo_activated
@@ -50,6 +46,10 @@ def main():
     from .editbooks import editbook
     from .about import about
     from .search import search
+    from .search_metadata import meta
+    from .shelf import shelf
+    from .tasks_status import tasks
+    from .error_handler import init_errorhandler
 
     from . import web_server
     init_errorhandler()
diff --git a/cps/opds.py b/cps/opds.py
index 2b8ab6d6..60dbd551 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -56,20 +56,6 @@ def requires_basic_auth_if_no_ano(f):
     return decorated
 
 
-class FeedObject:
-    def __init__(self, rating_id, rating_name):
-        self.rating_id = rating_id
-        self.rating_name = rating_name
-
-    @property
-    def id(self):
-        return self.rating_id
-
-    @property
-    def name(self):
-        return self.rating_name
-
-
 @opds.route("/opds/")
 @opds.route("/opds")
 @requires_basic_auth_if_no_ano
@@ -468,6 +454,20 @@ def feed_unread_books():
     return render_xml_template('feed.xml', entries=result, pagination=pagination)
 
 
+class FeedObject:
+    def __init__(self, rating_id, rating_name):
+        self.rating_id = rating_id
+        self.rating_name = rating_name
+
+    @property
+    def id(self):
+        return self.rating_id
+
+    @property
+    def name(self):
+        return self.rating_name
+
+
 def feed_search(term):
     if term:
         entries, __, ___ = calibre_db.get_search_results(term, config=config)
diff --git a/cps/search.py b/cps/search.py
index 429aea17..cd172b6b 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -406,7 +406,6 @@ def render_search_results(term, offset=None, order=None, limit=None):
                                                                       offset,
                                                                       order,
                                                                       limit,
-                                                                      False,
                                                                       *join)
     return render_title_template('search.html',
                                  searchterm=term,
diff --git a/cps/services/__init__.py b/cps/services/__init__.py
index 32a9d485..f93eca34 100644
--- a/cps/services/__init__.py
+++ b/cps/services/__init__.py
@@ -18,11 +18,10 @@
 
 from .. import logger
 
-
 log = logger.create()
 
-
-try: from . import goodreads_support
+try:
+    from . import goodreads_support
 except ImportError as err:
     log.debug("Cannot import goodreads, showing authors-metadata will not work: %s", err)
     goodreads_support = None
diff --git a/cps/shelf.py b/cps/shelf.py
index 35f2941d..49d9a633 100644
--- a/cps/shelf.py
+++ b/cps/shelf.py
@@ -33,27 +33,9 @@ from . import calibre_db, config, db, logger, ub
 from .render_template import render_title_template
 from .usermanagement import login_required_if_no_ano
 
-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 {} not allowed to edit shelf: {}".format(current_user.id, cur_shelf.name))
-        return False
-    if cur_shelf.is_public and not current_user.role_edit_shelfs():
-        log.info("User {} not allowed to edit public shelves".format(current_user.id))
-        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: {}".format(cur_shelf.name))
-        return False
-    return True
+shelf = Blueprint('shelf', __name__)
 
 
 @shelf.route("/shelf/add/<int:shelf_id>/<int:book_id>", methods=["POST"])
@@ -238,96 +220,6 @@ def edit_shelf(shelf_id):
     return create_edit_shelf(shelf, page_title=_(u"Edit a shelf"), page="shelfedit", shelf_id=shelf_id)
 
 
-# if shelf ID is set, we are editing a shelf
-def create_edit_shelf(shelf, page_title, page, shelf_id=False):
-    sync_only_selected_shelves = current_user.kobo_only_shelves_sync
-    # calibre_db.session.query(ub.Shelf).filter(ub.Shelf.user_id == current_user.id).filter(ub.Shelf.kobo_sync).count()
-    if request.method == "POST":
-        to_save = request.form.to_dict()
-        if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
-            flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
-            return redirect(url_for('web.index'))
-        is_public = 1 if to_save.get("is_public") == "on" else 0
-        if config.config_kobo_sync:
-            shelf.kobo_sync = True if to_save.get("kobo_sync") else False
-            if shelf.kobo_sync:
-                ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id).filter(
-                    ub.ShelfArchive.uuid == shelf.uuid).delete()
-                ub.session_commit()
-        shelf_title = to_save.get("title", "")
-        if check_shelf_is_unique(shelf, shelf_title, is_public, shelf_id):
-            shelf.name = shelf_title
-            shelf.is_public = is_public
-            if not shelf_id:
-                shelf.user_id = int(current_user.id)
-                ub.session.add(shelf)
-                shelf_action = "created"
-                flash_text = _(u"Shelf %(title)s created", title=shelf_title)
-            else:
-                shelf_action = "changed"
-                flash_text = _(u"Shelf %(title)s changed", title=shelf_title)
-            try:
-                ub.session.commit()
-                log.info(u"Shelf {} {}".format(shelf_title, shelf_action))
-                flash(flash_text, category="success")
-                return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
-            except (OperationalError, InvalidRequestError) as ex:
-                ub.session.rollback()
-                log.error_or_exception(ex)
-                log.error_or_exception("Settings Database error: {}".format(ex))
-                flash(_(u"Database error: %(error)s.", error=ex.orig), category="error")
-            except Exception as ex:
-                ub.session.rollback()
-                log.error_or_exception(ex)
-                flash(_(u"There was an error"), category="error")
-    return render_title_template('shelf_edit.html',
-                                 shelf=shelf,
-                                 title=page_title,
-                                 page=page,
-                                 kobo_sync_enabled=config.config_kobo_sync,
-                                 sync_only_selected_shelves=sync_only_selected_shelves)
-
-
-def check_shelf_is_unique(shelf, title, is_public, shelf_id=False):
-    if shelf_id:
-        ident = ub.Shelf.id != shelf_id
-    else:
-        ident = true()
-    if is_public == 1:
-        is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                                   .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
-                                   .filter(ident) \
-                                   .first() is None
-
-        if not is_shelf_name_unique:
-            log.error("A public shelf with the name '{}' already exists.".format(title))
-            flash(_(u"A public shelf with the name '%(title)s' already exists.", title=title),
-                  category="error")
-    else:
-        is_shelf_name_unique = ub.session.query(ub.Shelf) \
-                                   .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 0) &
-                                           (ub.Shelf.user_id == int(current_user.id))) \
-                                   .filter(ident) \
-                                   .first() is None
-
-        if not is_shelf_name_unique:
-            log.error("A private shelf with the name '{}' already exists.".format(title))
-            flash(_(u"A private shelf with the name '%(title)s' already exists.", title=title),
-                  category="error")
-    return is_shelf_name_unique
-
-
-def delete_shelf_helper(cur_shelf):
-    if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
-        return False
-    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.user_id))
-    ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
-    return True
-
-
 @shelf.route("/shelf/delete/<int:shelf_id>", methods=["POST"])
 @login_required
 def delete_shelf(shelf_id):
@@ -392,6 +284,115 @@ def order_shelf(shelf_id):
         abort(404)
 
 
+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 {} not allowed to edit shelf: {}".format(current_user.id, cur_shelf.name))
+        return False
+    if cur_shelf.is_public and not current_user.role_edit_shelfs():
+        log.info("User {} not allowed to edit public shelves".format(current_user.id))
+        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: {}".format(cur_shelf.name))
+        return False
+    return True
+
+
+# if shelf ID is set, we are editing a shelf
+def create_edit_shelf(shelf, page_title, page, shelf_id=False):
+    sync_only_selected_shelves = current_user.kobo_only_shelves_sync
+    # calibre_db.session.query(ub.Shelf).filter(ub.Shelf.user_id == current_user.id).filter(ub.Shelf.kobo_sync).count()
+    if request.method == "POST":
+        to_save = request.form.to_dict()
+        if not current_user.role_edit_shelfs() and to_save.get("is_public") == "on":
+            flash(_(u"Sorry you are not allowed to create a public shelf"), category="error")
+            return redirect(url_for('web.index'))
+        is_public = 1 if to_save.get("is_public") == "on" else 0
+        if config.config_kobo_sync:
+            shelf.kobo_sync = True if to_save.get("kobo_sync") else False
+            if shelf.kobo_sync:
+                ub.session.query(ub.ShelfArchive).filter(ub.ShelfArchive.user_id == current_user.id).filter(
+                    ub.ShelfArchive.uuid == shelf.uuid).delete()
+                ub.session_commit()
+        shelf_title = to_save.get("title", "")
+        if check_shelf_is_unique(shelf_title, is_public, shelf_id):
+            shelf.name = shelf_title
+            shelf.is_public = is_public
+            if not shelf_id:
+                shelf.user_id = int(current_user.id)
+                ub.session.add(shelf)
+                shelf_action = "created"
+                flash_text = _(u"Shelf %(title)s created", title=shelf_title)
+            else:
+                shelf_action = "changed"
+                flash_text = _(u"Shelf %(title)s changed", title=shelf_title)
+            try:
+                ub.session.commit()
+                log.info(u"Shelf {} {}".format(shelf_title, shelf_action))
+                flash(flash_text, category="success")
+                return redirect(url_for('shelf.show_shelf', shelf_id=shelf.id))
+            except (OperationalError, InvalidRequestError) as ex:
+                ub.session.rollback()
+                log.error_or_exception(ex)
+                log.error_or_exception("Settings Database error: {}".format(ex))
+                flash(_(u"Database error: %(error)s.", error=ex.orig), category="error")
+            except Exception as ex:
+                ub.session.rollback()
+                log.error_or_exception(ex)
+                flash(_(u"There was an error"), category="error")
+    return render_title_template('shelf_edit.html',
+                                 shelf=shelf,
+                                 title=page_title,
+                                 page=page,
+                                 kobo_sync_enabled=config.config_kobo_sync,
+                                 sync_only_selected_shelves=sync_only_selected_shelves)
+
+
+def check_shelf_is_unique(title, is_public, shelf_id=False):
+    if shelf_id:
+        ident = ub.Shelf.id != shelf_id
+    else:
+        ident = true()
+    if is_public == 1:
+        is_shelf_name_unique = ub.session.query(ub.Shelf) \
+                                   .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 1)) \
+                                   .filter(ident) \
+                                   .first() is None
+
+        if not is_shelf_name_unique:
+            log.error("A public shelf with the name '{}' already exists.".format(title))
+            flash(_(u"A public shelf with the name '%(title)s' already exists.", title=title),
+                  category="error")
+    else:
+        is_shelf_name_unique = ub.session.query(ub.Shelf) \
+                                   .filter((ub.Shelf.name == title) & (ub.Shelf.is_public == 0) &
+                                           (ub.Shelf.user_id == int(current_user.id))) \
+                                   .filter(ident) \
+                                   .first() is None
+
+        if not is_shelf_name_unique:
+            log.error("A private shelf with the name '{}' already exists.".format(title))
+            flash(_(u"A private shelf with the name '%(title)s' already exists.", title=title),
+                  category="error")
+    return is_shelf_name_unique
+
+
+def delete_shelf_helper(cur_shelf):
+    if not cur_shelf or not check_shelf_edit_permissions(cur_shelf):
+        return False
+    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.user_id))
+    ub.session_commit("successfully deleted Shelf {}".format(cur_shelf.name))
+    return True
+
+
 def change_shelf_order(shelf_id, order):
     result = calibre_db.session.query(db.Books).outerjoin(db.books_series_link,
                                                           db.Books.id == db.books_series_link.c.book)\
diff --git a/cps/tasks_status.py b/cps/tasks_status.py
index ca9b5796..e355ed85 100644
--- a/cps/tasks_status.py
+++ b/cps/tasks_status.py
@@ -34,7 +34,7 @@ log = logger.create()
 @tasks.route("/ajax/emailstat")
 @login_required
 def get_email_status_json():
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     return jsonify(render_task_status(tasks))
 
 
@@ -42,7 +42,7 @@ def get_email_status_json():
 @login_required
 def get_tasks_status():
     # if current user admin, show all email, otherwise only own emails
-    tasks = WorkerThread.getInstance().tasks
+    tasks = WorkerThread.get_instance().tasks
     answer = render_task_status(tasks)
     return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")
 
diff --git a/cps/templates/tasks.html b/cps/templates/tasks.html
index b0b5b3bd..5cbc5f8b 100644
--- a/cps/templates/tasks.html
+++ b/cps/templates/tasks.html
@@ -5,7 +5,7 @@
 {% block body %}
 <div class="discover">
     <h2>{{_('Tasks')}}</h2>
-    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('task.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
+    <table class="table table-no-bordered" id="tasktable" data-url="{{  url_for('tasks.get_email_status_json') }}"  data-sort-name="starttime" data-sort-order="asc" data-locale="{{ g.user.locale }}">
       <thead>
         <tr>
             {% if g.user.role_admin() %}
diff --git a/cps/web.py b/cps/web.py
index 178ed18c..83425191 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -72,10 +72,10 @@ except ImportError:
 
 from functools import wraps
 
-#try:
-#    from natsort import natsorted as sort
-#except ImportError:
-#    sort = sorted  # Just use regular sort then, may cause issues with badly named pages in cbz/cbr files
+try:
+    from natsort import natsorted as sort
+except ImportError:
+    sort = sorted  # Just use regular sort then, may cause issues with badly named pages in cbz/cbr files
 
 
 @app.after_request

From aaa749933d16a57b06309f01ef33962a866e3cc1 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 26 Apr 2022 14:55:00 +0200
Subject: [PATCH 214/220] Further migration to flask_babel Bugfix sort order
 Bugfix tasklist

---
 cps/admin.py              |  2 +-
 cps/babel.py              |  3 +--
 cps/db.py                 |  2 +-
 cps/jinjia.py             |  9 +++++----
 cps/search.py             | 13 +++++--------
 cps/search_metadata.py    |  8 ++++----
 cps/tasks_status.py       | 23 +++++++++++++++++------
 cps/web.py                | 12 ++++++------
 optional-requirements.txt |  4 ++--
 9 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index f5ae1037..91a16126 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -200,7 +200,7 @@ def admin():
                     form_date -= timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
                 elif commit[19] == '-':
                     form_date += timedelta(hours=int(commit[20:22]), minutes=int(commit[23:]))
-            commit = format_datetime(form_date - tz, format='short', locale=locale)
+            commit = format_datetime(form_date - tz, format='short')
         else:
             commit = version['version']
 
diff --git a/cps/babel.py b/cps/babel.py
index c1675809..f5ecaf5a 100644
--- a/cps/babel.py
+++ b/cps/babel.py
@@ -1,6 +1,5 @@
-from babel import Locale
 from babel import negotiate_locale
-from flask_babel import Babel
+from flask_babel import Babel, Locale
 from babel.core import UnknownLocaleError
 from flask import request, g
 
diff --git a/cps/db.py b/cps/db.py
index f28baeca..21104622 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -919,7 +919,7 @@ class CalibreDB:
                                  .count())
                 if no_lang_count:
                     tags.append([Category(_("None"), "none"), no_lang_count])
-            return sorted(tags, key=lambda x: x[0].name, reverse=reverse_order)
+            return sorted(tags, key=lambda x: x[0].name.lower(), reverse=reverse_order)
         else:
             if not languages:
                 languages = self.session.query(Languages) \
diff --git a/cps/jinjia.py b/cps/jinjia.py
index f88b36a2..e42c650c 100644
--- a/cps/jinjia.py
+++ b/cps/jinjia.py
@@ -22,15 +22,16 @@
 
 # custom jinja filters
 
+from markupsafe import escape
 import datetime
 import mimetypes
 from uuid import uuid4
 
-from babel.dates import format_date
+# from babel.dates import format_date
 from flask import Blueprint, request, url_for
-from flask_babel import get_locale
+from flask_babel import format_date
 from flask_login import current_user
-from markupsafe import escape
+
 from . import constants, logger
 
 jinjia = Blueprint('jinjia', __name__)
@@ -76,7 +77,7 @@ def mimetype_filter(val):
 @jinjia.app_template_filter('formatdate')
 def formatdate_filter(val):
     try:
-        return format_date(val, format='medium', locale=get_locale())
+        return format_date(val, format='medium')
     except AttributeError as e:
         log.error('Babel error: %s, Current user locale: %s, Current User: %s', e,
                   current_user.locale,
diff --git a/cps/search.py b/cps/search.py
index cd172b6b..602881bf 100644
--- a/cps/search.py
+++ b/cps/search.py
@@ -20,7 +20,7 @@ from datetime import datetime
 from flask import Blueprint, request, redirect, url_for, flash
 from flask import session as flask_session
 from flask_login import current_user
-from flask_babel import get_locale, format_date
+from flask_babel import format_date
 from flask_babel import gettext as _
 from sqlalchemy.sql.expression import func, not_, and_, or_, text
 from sqlalchemy.sql.functions import coalesce
@@ -193,14 +193,14 @@ def extend_search_term(searchterm,
         try:
             searchterm.extend([_(u"Published after ") +
                                format_date(datetime.strptime(pub_start, "%Y-%m-%d"),
-                                           format='medium', locale=get_locale())])
+                                           format='medium')])
         except ValueError:
             pub_start = u""
     if pub_end:
         try:
             searchterm.extend([_(u"Published before ") +
                                format_date(datetime.strptime(pub_end, "%Y-%m-%d"),
-                                           format='medium', locale=get_locale())])
+                                           format='medium')])
         except ValueError:
             pub_end = u""
     elements = {'tag': db.Tags, 'serie':db.Series, 'shelf':ub.Shelf}
@@ -291,22 +291,19 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
             if column_start:
                 search_term.extend([u"{} >= {}".format(c.name,
                                                        format_date(datetime.strptime(column_start, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
+                                                                   format='medium')
                                                        )])
                 cc_present = True
             if column_end:
                 search_term.extend([u"{} <= {}".format(c.name,
                                                        format_date(datetime.strptime(column_end, "%Y-%m-%d").date(),
-                                                                   format='medium',
-                                                                   locale=get_locale())
+                                                                   format='medium')
                                                        )])
                 cc_present = True
         elif term.get('custom_column_' + str(c.id)):
             search_term.extend([(u"{}: {}".format(c.name, term.get('custom_column_' + str(c.id))))])
             cc_present = True
 
-
     if any(tags.values()) or author_name or book_title or publisher or pub_start or pub_end or rating_low \
        or rating_high or description or cc_present or read_status:
         search_term, pub_start, pub_end = extend_search_term(search_term,
diff --git a/cps/search_metadata.py b/cps/search_metadata.py
index ae95a28e..e018da32 100644
--- a/cps/search_metadata.py
+++ b/cps/search_metadata.py
@@ -22,7 +22,6 @@ import inspect
 import json
 import os
 import sys
-from dataclasses import asdict
 
 from flask import Blueprint, Response, request, url_for
 from flask_login import current_user
@@ -57,9 +56,10 @@ for f in modules:
         try:
             importlib.import_module("cps.metadata_provider." + a)
             new_list.append(a)
-        except (ImportError, IndentationError, SyntaxError) as e:
-            log.error("Import error for metadata source: {} - {}".format(a, e))
-            pass
+        except (IndentationError, SyntaxError) as e:
+            log.error("Syntax error for metadata source: {} - {}".format(a, e))
+        except ImportError as e:
+            log.debug("Import error for metadata source: {} - {}".format(a, e))
 
 
 def list_classes(provider_list):
diff --git a/cps/tasks_status.py b/cps/tasks_status.py
index e355ed85..e5f91975 100644
--- a/cps/tasks_status.py
+++ b/cps/tasks_status.py
@@ -19,12 +19,13 @@ from markupsafe import escape
 from flask import Blueprint, jsonify
 from flask_login import login_required, current_user
 from flask_babel import gettext as _
-from flask_babel import get_locale, format_datetime
+from flask_babel import format_datetime
 from babel.units import format_unit
 
 from . import logger
 from .render_template import render_title_template
-from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS
+from .services.worker import WorkerThread, STAT_WAITING, STAT_FAIL, STAT_STARTED, STAT_FINISH_SUCCESS, STAT_ENDED, \
+    STAT_CANCELLED
 
 tasks = Blueprint('tasks', __name__)
 
@@ -50,11 +51,11 @@ def get_tasks_status():
 # helper function to apply localize status information in tasklist entries
 def render_task_status(tasklist):
     rendered_tasklist = list()
-    for __, user, __, task in tasklist:
+    for __, user, __, task, __ in tasklist:
         if user == current_user.name or current_user.role_admin():
             ret = {}
             if task.start_time:
-                ret['starttime'] = format_datetime(task.start_time, format='short', locale=get_locale())
+                ret['starttime'] = format_datetime(task.start_time, format='short')
                 ret['runtime'] = format_runtime(task.runtime)
 
             # localize the task status
@@ -67,12 +68,22 @@ def render_task_status(tasklist):
                     ret['status'] = _(u'Started')
                 elif task.stat == STAT_FINISH_SUCCESS:
                     ret['status'] = _(u'Finished')
+                elif task.stat == STAT_ENDED:
+                    ret['status'] = _(u'Ended')
+                elif task.stat == STAT_CANCELLED:
+                    ret['status'] = _(u'Cancelled')
                 else:
                     ret['status'] = _(u'Unknown Status')
 
-            ret['taskMessage'] = "{}: {}".format(_(task.name), task.message)
+            ret['taskMessage'] = "{}: {}".format(task.name, task.message) if task.message else task.name
             ret['progress'] = "{} %".format(int(task.progress * 100))
             ret['user'] = escape(user)  # prevent xss
+
+            # Hidden fields
+            ret['task_id'] = task.id
+            ret['stat'] = task.stat
+            ret['is_cancellable'] = task.is_cancellable
+
             rendered_tasklist.append(ret)
 
     return rendered_tasklist
@@ -82,7 +93,7 @@ def render_task_status(tasklist):
 def format_runtime(runtime):
     ret_val = ""
     if runtime.days:
-        ret_val = format_unit(runtime.days, 'duration-day', length="long", locale=get_locale()) + ', '
+        ret_val = format_unit(runtime.days, 'duration-day', length="long") + ', '
     minutes, seconds = divmod(runtime.seconds, 60)
     hours, minutes = divmod(minutes, 60)
     # ToDo: locale.number_symbols._data['timeSeparator'] -> localize time separator ?
diff --git a/cps/web.py b/cps/web.py
index 83425191..1aa4cc1b 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -24,7 +24,6 @@ import mimetypes
 import chardet  # dependency of requests
 import copy
 
-from babel import Locale
 from flask import Blueprint, jsonify
 from flask import request, redirect, send_from_directory, make_response, flash, abort, url_for
 from flask import session as flask_session
@@ -40,7 +39,7 @@ from werkzeug.datastructures import Headers
 from werkzeug.security import generate_password_hash, check_password_hash
 
 from . import constants, logger, isoLanguages, services
-from . import babel, db, ub, config, app
+from . import db, ub, config, app
 from . import calibre_db, kobo_sync_status
 from .search import render_search_results, render_adv_search_results
 from .gdriveutils import getFileFromEbooksFolder, do_gdrive_download
@@ -50,6 +49,7 @@ from .helper import check_valid_domain, check_email, check_username, \
     edit_book_read_status
 from .pagination import Pagination
 from .redirect import redirect_back
+from .babel import get_available_locale
 from .usermanagement import login_required_if_no_ano
 from .kobo_sync_status import remove_synced_book
 from .render_template import render_title_template
@@ -960,7 +960,7 @@ def publisher_list():
                            .count())
         if no_publisher_count:
             entries.append([db.Category(_("None"), "-1"), no_publisher_count])
-        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
+        entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
@@ -990,7 +990,7 @@ def series_list():
                             .count())
             if no_series_count:
                 entries.append([db.Category(_("None"), "-1"), no_series_count])
-            entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
+            entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
             return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                          title=_(u"Series"), page="serieslist", data="series", order=order_no)
         else:
@@ -1092,7 +1092,7 @@ def category_list():
                          .count())
         if no_tag_count:
             entries.append([db.Category(_("None"), "-1"), no_tag_count])
-        entries = sorted(entries, key=lambda x: x[0].name, reverse=not order_no)
+        entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
         char_list = generate_char_list(entries)
         return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
                                      title=_(u"Categories"), page="catlist", data="category", order=order_no)
@@ -1417,7 +1417,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
 @login_required
 def profile():
     languages = calibre_db.speaking_language()
-    translations = babel.list_translations() + [Locale('en')]
+    translations = get_available_locale()
     kobo_support = feature_support['kobo'] and config.config_kobo_sync
     if feature_support['oauth'] and config.config_login_type == 2:
         oauth_status = get_oauth_status()
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 07e1ad88..4360d221 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client>=1.7.11,<2.46.0
+google-api-python-client>=1.7.11,<2.50.0
 gevent>20.6.0,<22.0.0
 greenlet>=0.4.17,<1.2.0
 httplib2>=0.9.2,<0.21.0
@@ -13,7 +13,7 @@ rsa>=3.4.2,<4.9.0
 
 # Gmail
 google-auth-oauthlib>=0.4.3,<0.6.0
-google-api-python-client>=1.7.11,<2.46.0
+google-api-python-client>=1.7.11,<2.50.0
 
 # goodreads
 goodreads>=0.3.2,<0.4.0

From a968ddaef23eca781f70cc1c678ae7382dc7c2e4 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 28 Apr 2022 20:57:09 +0200
Subject: [PATCH 215/220] Bugfixes after testrun

---
 cps/__init__.py                         |    5 +
 cps/helper.py                           |   24 +-
 cps/main.py                             |   13 +-
 test/Calibre-Web TestSummary_Linux.html | 3103 +++++++++++++++--------
 4 files changed, 2112 insertions(+), 1033 deletions(-)

diff --git a/cps/__init__.py b/cps/__init__.py
index f597aab5..3f92571b 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -166,6 +166,11 @@ def create_app():
                                            config.config_goodreads_api_secret,
                                            config.config_use_goodreads)
     config.store_calibre_uuid(calibre_db, db.Library_Id)
+    # Register scheduled tasks
+    from .schedule import register_scheduled_tasks, register_startup_tasks
+    register_scheduled_tasks(config.schedule_reconnect)
+    register_startup_tasks()
+
     return app
 
 
diff --git a/cps/helper.py b/cps/helper.py
index 7c76d180..7362eb9e 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -342,9 +342,9 @@ def edit_book_read_status(book_id, read_status=None):
     return ""
 
 
-# Deletes a book fro the local filestorage, returns True if deleting is successfull, otherwise false
+# Deletes a book from the local filestorage, returns True if deleting is successful, otherwise false
 def delete_book_file(book, calibrepath, book_format=None):
-    # check that path is 2 elements deep, check that target path has no subfolders
+    # check that path is 2 elements deep, check that target path has no sub folders
     if book.path.count('/') == 1:
         path = os.path.join(calibrepath, book.path)
         if book_format:
@@ -679,7 +679,8 @@ def update_dir_structure(book_id,
 
 
 def delete_book(book, calibrepath, book_format):
-    clear_cover_thumbnail_cache(book.id)
+    if not book_format:
+        clear_cover_thumbnail_cache(book.id)        ## here it breaks
     if config.config_use_google_drive:
         return delete_book_gdrive(book, book_format)
     else:
@@ -1003,21 +1004,26 @@ def get_download_link(book_id, book_format, client):
 
 
 def clear_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
 
 
 def replace_cover_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
-    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskClearCoverThumbnailCache(book_id), hidden=True)
+        WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
 
 
 def delete_thumbnail_cache():
-    WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
 
 
 def add_book_to_thumbnail_cache(book_id):
-    WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskGenerateCoverThumbnails(book_id), hidden=True)
 
 
 def update_thumbnail_cache():
-    WorkerThread.add(None, TaskGenerateCoverThumbnails())
+    if config.schedule_generate_book_covers:
+        WorkerThread.add(None, TaskGenerateCoverThumbnails())
diff --git a/cps/main.py b/cps/main.py
index ccf03c15..16d288ac 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -22,13 +22,6 @@ from . import create_app
 from .jinjia import jinjia
 from .remotelogin import remotelogin
 
-try:
-    from kobo import kobo, get_kobo_activated
-    from kobo_auth import kobo_auth
-    kobo_available = get_kobo_activated()
-except (ImportError, AttributeError):   # Catch also error for not installed flask-WTF (missing csrf decorator)
-    kobo_available = False
-
 try:
     from oauth_bb import oauth
     oauth_available = True
@@ -50,6 +43,12 @@ def main():
     from .shelf import shelf
     from .tasks_status import tasks
     from .error_handler import init_errorhandler
+    try:
+        from .kobo import kobo, get_kobo_activated
+        from .kobo_auth import kobo_auth
+        kobo_available = get_kobo_activated()
+    except (ImportError, AttributeError):  # Catch also error for not installed flask-WTF (missing csrf decorator)
+        kobo_available = False
 
     from . import web_server
     init_errorhandler()
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index df55a037..cf3e893d 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-04-25 20:37:58</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-27 19:55: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>2022-04-26 02:14:54</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-28 01:28:47</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>4h 44 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 34 min</p>
         </div>
       </div>
       </div>
@@ -236,13 +236,13 @@
 
     <tr id="su" class="passClass">
         <td>TestCli</td>
-        <td class="text-center">9</td>
-        <td class="text-center">9</td>
+        <td class="text-center">10</td>
+        <td class="text-center">10</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('c2', 9)">Detail</a>
+            <a onclick="showClassDetail('c2', 10)">Detail</a>
         </td>
     </tr>
 
@@ -321,6 +321,15 @@
     
     
         <tr id='pt2.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCli - test_no_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt2.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCli - test_settingsdb_not_writeable</div>
             </td>
@@ -332,13 +341,13 @@
 
     <tr id="su" class="passClass">
         <td>TestCliGdrivedb</td>
-        <td class="text-center">3</td>
-        <td class="text-center">3</td>
+        <td class="text-center">4</td>
+        <td class="text-center">4</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('c3', 3)">Detail</a>
+            <a onclick="showClassDetail('c3', 4)">Detail</a>
         </td>
     </tr>
 
@@ -370,6 +379,15 @@
         </tr>
     
     
+    
+        <tr id='pt3.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCliGdrivedb - test_no_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
 
 
     <tr id="su" class="passClass">
@@ -761,12 +779,12 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestEditAdditionalBooks</td>
         <td class="text-center">17</td>
-        <td class="text-center">10</td>
-        <td class="text-center">2</td>
-        <td class="text-center">4</td>
+        <td class="text-center">16</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('c10', 17)">Detail</a>
@@ -820,34 +838,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft10.6" class="none bg-danger">
+        <tr id='pt10.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 461, in test_edit_book_identifier
-    self.assertEqual(&#39;Hallo1&#39;, list(result[&#39;identifier&#39;][-1].keys())[0])
-AssertionError: &#39;Hallo1&#39; != &#39;Hallo&#39;
-- Hallo1
-?      -
-+ Hallo</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -861,31 +856,11 @@ AssertionError: &#39;Hallo1&#39; != &#39;Hallo&#39;
     
     
     
-        <tr id="ft10.8" class="none bg-danger">
+        <tr id='pt10.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_edit_book_identifier_standard</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft10.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft10.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft10.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 614, in test_edit_book_identifier_standard
-    self.assertEqual(final_length, reference_length)
-AssertionError: 14 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -926,70 +901,20 @@ AssertionError: 14 != 0</pre>
     
     
     
-        <tr id="et10.13" class="none bg-info">
+        <tr id='pt10.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbr</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 166, in test_upload_metadata_cbr
-    self.assertEqual(&#39;Test 执book&#39;, details[&#39;title&#39;])
-KeyError: &#39;title&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.14" class="none bg-info">
+        <tr id='pt10.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_upload_metadata_cbt</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.14')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.14" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.14').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 185, in test_upload_metadata_cbt
-    self.fill_basic_config({&#39;config_uploading&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1003,145 +928,20 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="et10.16" class="none bg-info">
+        <tr id='pt10.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_comment_edit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.16')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.16" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.16').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 810, in test_xss_comment_edit
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et10.17" class="none bg-info">
+        <tr id='pt10.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAdditionalBooks - test_xss_custom_comment_edit</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et10.17')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et10.17" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et10.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 832, in test_xss_custom_comment_edit
-    self.check_element_on_page((By.ID, &#34;edit_book&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">2</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('c11', 2)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et11.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_edit_additional_books)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_additional_books.py&#34;, line 44, in tearDownClass
-    cls.stop_calibre_web()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 475, in stop_calibre_web
-    cls.driver.find_element(By.ID, &#39;admin_stop&#39;).click()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 425, in execute
-    self.error_handler.check_response(response)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/errorhandler.py&#34;, line 247, in check_response
-    raise exception_class(message, screen, stacktrace)
-selenium.common.exceptions.NoSuchElementException: Message: Unable to locate element: [id=&#34;admin_stop&#34;]
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et11.2" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_thumbnail_env)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et11.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et11.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et11.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 26, in setUpClass
-    add_dependency(cls.json_line, cls.__name__)
-AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;json_line&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1155,13 +955,13 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c12', 36)">Detail</a>
+            <a onclick="showClassDetail('c11', 36)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt12.1' class='hiddenRow bg-success'>
+        <tr id='pt11.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_download_book</div>
             </td>
@@ -1170,7 +970,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.2' class='hiddenRow bg-success'>
+        <tr id='pt11.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_author</div>
             </td>
@@ -1179,7 +979,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.3' class='hiddenRow bg-success'>
+        <tr id='pt11.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_category</div>
             </td>
@@ -1188,7 +988,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.4' class='hiddenRow bg-success'>
+        <tr id='pt11.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_comments</div>
             </td>
@@ -1197,7 +997,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.5' class='hiddenRow bg-success'>
+        <tr id='pt11.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_bool</div>
             </td>
@@ -1206,7 +1006,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.6' class='hiddenRow bg-success'>
+        <tr id='pt11.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_categories</div>
             </td>
@@ -1215,7 +1015,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.7' class='hiddenRow bg-success'>
+        <tr id='pt11.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_comment</div>
             </td>
@@ -1224,7 +1024,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.8' class='hiddenRow bg-success'>
+        <tr id='pt11.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_date</div>
             </td>
@@ -1233,7 +1033,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.9' class='hiddenRow bg-success'>
+        <tr id='pt11.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_float</div>
             </td>
@@ -1242,7 +1042,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.10' class='hiddenRow bg-success'>
+        <tr id='pt11.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_int</div>
             </td>
@@ -1251,7 +1051,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.11' class='hiddenRow bg-success'>
+        <tr id='pt11.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_rating</div>
             </td>
@@ -1260,7 +1060,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.12' class='hiddenRow bg-success'>
+        <tr id='pt11.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_single_select</div>
             </td>
@@ -1269,7 +1069,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.13' class='hiddenRow bg-success'>
+        <tr id='pt11.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_custom_text</div>
             </td>
@@ -1278,7 +1078,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.14' class='hiddenRow bg-success'>
+        <tr id='pt11.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_language</div>
             </td>
@@ -1287,7 +1087,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.15' class='hiddenRow bg-success'>
+        <tr id='pt11.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publisher</div>
             </td>
@@ -1296,7 +1096,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.16' class='hiddenRow bg-success'>
+        <tr id='pt11.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_publishing_date</div>
             </td>
@@ -1305,7 +1105,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.17' class='hiddenRow bg-success'>
+        <tr id='pt11.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_rating</div>
             </td>
@@ -1314,7 +1114,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.18' class='hiddenRow bg-success'>
+        <tr id='pt11.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_series</div>
             </td>
@@ -1323,7 +1123,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.19' class='hiddenRow bg-success'>
+        <tr id='pt11.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_edit_title</div>
             </td>
@@ -1332,19 +1132,19 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id="st12.20" class="none bg-warning">
+        <tr id="st11.20" class="none bg-warning">
             <td>
                 <div class='testcase'>TestEditBooks - test_rename_uppercase_lowercase</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st12.20')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st11.20')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st12.20" class="popup_window test_output" style="display:none;">
+                <div id="div_st11.20" 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_st12.20').style.display='none'"><span
+                                onclick="document.getElementById('div_st11.20').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1358,7 +1158,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.21' class='hiddenRow bg-success'>
+        <tr id='pt11.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_author</div>
             </td>
@@ -1367,7 +1167,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.22' class='hiddenRow bg-success'>
+        <tr id='pt11.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_functions</div>
             </td>
@@ -1376,7 +1176,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.23' class='hiddenRow bg-success'>
+        <tr id='pt11.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_language</div>
             </td>
@@ -1385,7 +1185,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.24' class='hiddenRow bg-success'>
+        <tr id='pt11.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_publisher</div>
             </td>
@@ -1394,7 +1194,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.25' class='hiddenRow bg-success'>
+        <tr id='pt11.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_series</div>
             </td>
@@ -1403,7 +1203,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.26' class='hiddenRow bg-success'>
+        <tr id='pt11.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_typeahead_tag</div>
             </td>
@@ -1412,7 +1212,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.27' class='hiddenRow bg-success'>
+        <tr id='pt11.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbr</div>
             </td>
@@ -1421,7 +1221,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.28' class='hiddenRow bg-success'>
+        <tr id='pt11.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbt</div>
             </td>
@@ -1430,7 +1230,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.29' class='hiddenRow bg-success'>
+        <tr id='pt11.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_cbz</div>
             </td>
@@ -1439,7 +1239,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.30' class='hiddenRow bg-success'>
+        <tr id='pt11.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_epub</div>
             </td>
@@ -1448,7 +1248,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.31' class='hiddenRow bg-success'>
+        <tr id='pt11.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_fb2</div>
             </td>
@@ -1457,7 +1257,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.32' class='hiddenRow bg-success'>
+        <tr id='pt11.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_lit</div>
             </td>
@@ -1466,7 +1266,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.33' class='hiddenRow bg-success'>
+        <tr id='pt11.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_mobi</div>
             </td>
@@ -1475,7 +1275,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.34' class='hiddenRow bg-success'>
+        <tr id='pt11.34' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_book_pdf</div>
             </td>
@@ -1484,7 +1284,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.35' class='hiddenRow bg-success'>
+        <tr id='pt11.35' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cbz_coverformats</div>
             </td>
@@ -1493,7 +1293,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
     
-        <tr id='pt12.36' class='hiddenRow bg-success'>
+        <tr id='pt11.36' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooks - test_upload_cover_hdd</div>
             </td>
@@ -1503,11 +1303,80 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditAuthors</td>
         <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
+        <td class="text-center">6</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('c12', 6)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt12.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt12.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="passClass">
+        <td>TestEditAuthorsGdrive</td>
+        <td class="text-center">6</td>
+        <td class="text-center">6</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1519,7 +1388,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_co_author</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1528,7 +1397,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.2' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_one_book</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1537,7 +1406,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_one_author_two_books</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1546,7 +1415,7 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
         <tr id='pt13.4' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_co_author</div>
+                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
@@ -1554,103 +1423,6 @@ AttributeError: type object &#39;TestThumbnailsEnv&#39; has no attribute &#39;js
     
     
         <tr id='pt13.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthors - test_change_capital_rename_two_co_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="ft13.6" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestEditAuthors - test_rename_capital_on_upload</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft13.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft13.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft13.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author.py&#34;, line 471, in test_rename_capital_on_upload
-    self.assertEqual([&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;], details[&#39;author&#39;])
-AssertionError: Lists differ: [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;] != [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
-
-Second list contains 1 additional elements.
-First extra element 4:
-&#39;Liu Yang&#39;
-
-- [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;]
-+ [&#39;Frodo Beutlin&#39;, &#39;Norbert Halagal&#39;, &#39;Liu Yang&#39;, &#39;Hector Gonçalves&#39;, &#39;Liu Yang&#39;]
-?                                                                    ++++++++++++</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="failClass">
-        <td>TestEditAuthorsGdrive</td>
-        <td class="text-center">6</td>
-        <td class="text-center">5</td>
-        <td class="text-center">1</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c14', 6)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt14.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_one_book</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_one_author_two_books</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_co_author</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_change_capital_rename_two_co_authors</div>
             </td>
@@ -1659,38 +1431,11 @@ First extra element 4:
     
     
     
-        <tr id="ft14.6" class="none bg-danger">
+        <tr id='pt13.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditAuthorsGdrive - test_rename_capital_on_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft14.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft14.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft14.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_books_author_gdrive.py&#34;, line 564, in test_rename_capital_on_upload
-    self.assertEqual([&#39;Asterix Lionherd&#39;], details[&#39;author&#39;])
-AssertionError: Lists differ: [&#39;Asterix Lionherd&#39;] != [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]
-
-Second list contains 1 additional elements.
-First extra element 1:
-&#39;Asterix Lionherd&#39;
-
-- [&#39;Asterix Lionherd&#39;]
-+ [&#39;Asterix Lionherd&#39;, &#39;Asterix Lionherd&#39;]</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1704,13 +1449,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c15', 18)">Detail</a>
+            <a onclick="showClassDetail('c14', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt15.1' class='hiddenRow bg-success'>
+        <tr id='pt14.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_author</div>
             </td>
@@ -1719,7 +1464,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.2' class='hiddenRow bg-success'>
+        <tr id='pt14.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_categories</div>
             </td>
@@ -1728,7 +1473,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.3' class='hiddenRow bg-success'>
+        <tr id='pt14.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_comment</div>
             </td>
@@ -1737,7 +1482,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.4' class='hiddenRow bg-success'>
+        <tr id='pt14.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_category</div>
             </td>
@@ -1746,7 +1491,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.5' class='hiddenRow bg-success'>
+        <tr id='pt14.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_comment</div>
             </td>
@@ -1755,7 +1500,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.6' class='hiddenRow bg-success'>
+        <tr id='pt14.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_enum</div>
             </td>
@@ -1764,7 +1509,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.7' class='hiddenRow bg-success'>
+        <tr id='pt14.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_float</div>
             </td>
@@ -1773,7 +1518,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.8' class='hiddenRow bg-success'>
+        <tr id='pt14.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_int</div>
             </td>
@@ -1782,7 +1527,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.9' class='hiddenRow bg-success'>
+        <tr id='pt14.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_ratings</div>
             </td>
@@ -1791,7 +1536,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.10' class='hiddenRow bg-success'>
+        <tr id='pt14.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_cust_text</div>
             </td>
@@ -1800,7 +1545,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.11' class='hiddenRow bg-success'>
+        <tr id='pt14.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_languages</div>
             </td>
@@ -1809,7 +1554,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.12' class='hiddenRow bg-success'>
+        <tr id='pt14.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_publisher</div>
             </td>
@@ -1818,7 +1563,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.13' class='hiddenRow bg-success'>
+        <tr id='pt14.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_series</div>
             </td>
@@ -1827,7 +1572,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.14' class='hiddenRow bg-success'>
+        <tr id='pt14.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_seriesindex</div>
             </td>
@@ -1836,7 +1581,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.15' class='hiddenRow bg-success'>
+        <tr id='pt14.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_bookslist_edit_title</div>
             </td>
@@ -1845,7 +1590,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.16' class='hiddenRow bg-success'>
+        <tr id='pt14.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_list_visibility</div>
             </td>
@@ -1854,7 +1599,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.17' class='hiddenRow bg-success'>
+        <tr id='pt14.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_restricted_rights</div>
             </td>
@@ -1863,7 +1608,7 @@ First extra element 1:
     
     
     
-        <tr id='pt15.18' class='hiddenRow bg-success'>
+        <tr id='pt14.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksList - test_search_books_list</div>
             </td>
@@ -1881,13 +1626,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c16', 1)">Detail</a>
+            <a onclick="showClassDetail('c15', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt16.1' class='hiddenRow bg-success'>
+        <tr id='pt15.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadata - test_load_metadata</div>
             </td>
@@ -1905,13 +1650,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 18)">Detail</a>
+            <a onclick="showClassDetail('c16', 18)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt16.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_download_book</div>
             </td>
@@ -1920,7 +1665,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt16.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_author</div>
             </td>
@@ -1929,7 +1674,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt16.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_category</div>
             </td>
@@ -1938,7 +1683,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt16.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_comments</div>
             </td>
@@ -1947,7 +1692,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt16.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_bool</div>
             </td>
@@ -1956,7 +1701,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt16.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_categories</div>
             </td>
@@ -1965,7 +1710,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt16.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_float</div>
             </td>
@@ -1974,7 +1719,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt16.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_int</div>
             </td>
@@ -1983,7 +1728,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt16.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_rating</div>
             </td>
@@ -1992,7 +1737,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.10' class='hiddenRow bg-success'>
+        <tr id='pt16.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_single_select</div>
             </td>
@@ -2001,7 +1746,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.11' class='hiddenRow bg-success'>
+        <tr id='pt16.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_custom_text</div>
             </td>
@@ -2010,7 +1755,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.12' class='hiddenRow bg-success'>
+        <tr id='pt16.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_language</div>
             </td>
@@ -2019,7 +1764,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.13' class='hiddenRow bg-success'>
+        <tr id='pt16.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_publisher</div>
             </td>
@@ -2028,7 +1773,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.14' class='hiddenRow bg-success'>
+        <tr id='pt16.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_rating</div>
             </td>
@@ -2037,7 +1782,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.15' class='hiddenRow bg-success'>
+        <tr id='pt16.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_series</div>
             </td>
@@ -2046,7 +1791,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.16' class='hiddenRow bg-success'>
+        <tr id='pt16.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_edit_title</div>
             </td>
@@ -2055,7 +1800,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.17' class='hiddenRow bg-success'>
+        <tr id='pt16.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_upload_book_lit</div>
             </td>
@@ -2064,7 +1809,7 @@ First extra element 1:
     
     
     
-        <tr id='pt17.18' class='hiddenRow bg-success'>
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
@@ -2082,13 +1827,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 1)">Detail</a>
+            <a onclick="showClassDetail('c17', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt17.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLoadMetadataScholar - test_load_metadata</div>
             </td>
@@ -2106,13 +1851,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 3)">Detail</a>
+            <a onclick="showClassDetail('c18', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt19.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS</div>
             </td>
@@ -2121,7 +1866,7 @@ First extra element 1:
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_SSL_setup_error</div>
             </td>
@@ -2130,7 +1875,7 @@ First extra element 1:
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSTARTTLS - test_STARTTLS_resend_password</div>
             </td>
@@ -2148,13 +1893,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 7)">Detail</a>
+            <a onclick="showClassDetail('c19', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_None_setup_error</div>
             </td>
@@ -2163,7 +1908,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_STARTTLS_setup_error</div>
             </td>
@@ -2172,7 +1917,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_logging_email</div>
             </td>
@@ -2181,7 +1926,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_non_admin_user</div>
             </td>
@@ -2190,7 +1935,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_SSL_only</div>
             </td>
@@ -2199,7 +1944,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_email_limit</div>
             </td>
@@ -2208,7 +1953,7 @@ First extra element 1:
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSSL - test_filepicker_two_file</div>
             </td>
@@ -2226,13 +1971,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c21', 1)">Detail</a>
+            <a onclick="showClassDetail('c20', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt21.1' class='hiddenRow bg-success'>
+        <tr id='pt20.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestBookDatabase - test_invalid_book_path</div>
             </td>
@@ -2250,13 +1995,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 2)">Detail</a>
+            <a onclick="showClassDetail('c21', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_column</div>
             </td>
@@ -2265,7 +2010,7 @@ First extra element 1:
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestErrorReadColumn - test_invalid_custom_read_column</div>
             </td>
@@ -2283,13 +2028,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c23', 3)">Detail</a>
+            <a onclick="showClassDetail('c22', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt23.1' class='hiddenRow bg-success'>
+        <tr id='pt22.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
             </td>
@@ -2298,19 +2043,19 @@ First extra element 1:
     
     
     
-        <tr id="st23.2" class="none bg-warning">
+        <tr id="st22.2" class="none bg-warning">
             <td>
                 <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st23.2')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st22.2')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st23.2" class="popup_window test_output" style="display:none;">
+                <div id="div_st22.2" 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_st23.2').style.display='none'"><span
+                                onclick="document.getElementById('div_st22.2').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2324,7 +2069,7 @@ First extra element 1:
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt22.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestFilePicker - test_two_filepickers</div>
             </td>
@@ -2342,13 +2087,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 1)">Detail</a>
+            <a onclick="showClassDetail('c23', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -2366,13 +2111,13 @@ First extra element 1:
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 3)">Detail</a>
+            <a onclick="showClassDetail('c24', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt25.1' class='hiddenRow bg-success'>
+        <tr id='pt24.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page</div>
             </td>
@@ -2381,7 +2126,7 @@ First extra element 1:
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -2390,7 +2135,7 @@ First extra element 1:
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -2400,115 +2145,1281 @@ First extra element 1:
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
-        <td class="text-center">11</td>
-        <td class="text-center">0</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">10</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c26', 11)">Detail</a>
+            <a onclick="showClassDetail('c25', 11)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt26.1' class='hiddenRow bg-success'>
+        <tr id="et25.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</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_et25.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 582, in test_book_download
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id="ft25.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</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_ft25.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft25.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 579, in test_kobo_about
+    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id="et25.3" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</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_et25.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 601, in test_kobo_sync_selected_shelfs
+    data = self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id="et25.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_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_et25.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 651, in test_kobo_upload_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id="et25.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</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_et25.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.5').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 446, in test_shelves_add_remove_books
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id="et25.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_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_et25.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.6').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 276, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.7' class='hiddenRow bg-success'>
+        <tr id="et25.7" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</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_et25.7')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 229, in test_sync_invalid
+    r = requests.post(self.kobo_adress+&#39;x/v1/auth/device&#39;, json=payload, timeout=10)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id="et25.8" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</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_et25.8')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.8').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 513, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.9' class='hiddenRow bg-success'>
+        <tr id="et25.9" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</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_et25.9')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 295, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.10' class='hiddenRow bg-success'>
+        <tr id="et25.10" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</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_et25.10')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.10" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.10').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 242, in test_sync_unchanged
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt26.11' class='hiddenRow bg-success'>
+        <tr id="et25.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</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_et25.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et25.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et25.11').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 256, in test_sync_upload
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
+    self.get_book_details(5)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
+    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c26', 5)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et26.1" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_kobo_sync)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 54, in tearDownClass
+    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.2" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_kobo_sync_big)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.2').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 61, in tearDownClass
+    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.3" class="none bg-info">
+            <td>
+                <div class='testcase'>tearDownClass (test_reverse_proxy)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.3')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 37, in tearDownClass
+    cls.driver.get(&#39;http://&#39; + get_Host_IP() + &#39;:8083&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
+    self.execute(Command.GET, {&#39;url&#39;: url})
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.4" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_updater)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 27, in setUpClass
+    cls.proxy = Proxy()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_proxy.py&#34;, line 305, in __init__
+    self.m = DumpMaster(opts, with_termlog=False, with_dumper=False)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/tools/dump.py&#34;, line 28, in __init__
+    self.addons.add(*addons.default_addons())
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 199, in add
+    self.chain.append(self.register(i))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 184, in register
+    self.invoke_addon(addon, LoadHook(l))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 264, in invoke_addon
+    func(*event.args())
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addons/proxyserver.py&#34;, line 101, in load
+    loader.add_option(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 91, in add_option
+    ctx.log.warn(&#34;Over-riding existing option %s&#34; % name)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 55, in warn
+    self(txt, &#34;warn&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 64, in __call__
+    asyncio.get_event_loop().call_soon(
+  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 719, in call_soon
+    self._check_closed()
+  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 508, in _check_closed
+    raise RuntimeError(&#39;Event loop is closed&#39;)
+RuntimeError: Event loop is closed</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="et26.5" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_zz_helper)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et26.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et26.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
+    from cps import helper, updater
+  File &#34;/home/ozzie/Development/calibre-web/cps/helper.py&#34;, line 53, in &lt;module&gt;
+    from .tasks.convert import TaskConvert
+  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/convert.py&#34;, line 36, in &lt;module&gt;
+    from cps.tasks.mail import TaskEmail
+  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/mail.py&#34;, line 36, in &lt;module&gt;
+    from cps import gdriveutils
+  File &#34;/home/ozzie/Development/calibre-web/cps/gdriveutils.py&#34;, line 145, in &lt;module&gt;
+    engine = create_engine(&#39;sqlite:///{0}&#39;.format(cli_param.gd_path), echo=False)
+AttributeError: &#39;CliParameter&#39; object has no attribute &#39;gd_path&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2517,9 +3428,9 @@ First extra element 1:
     <tr id="su" class="errorClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">6</td>
-        <td class="text-center">3</td>
-        <td class="text-center">1</td>
-        <td class="text-center">2</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">6</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c27', 6)">Detail</a>
@@ -2528,26 +3439,88 @@ First extra element 1:
 
     
     
-        <tr id="ft27.1" class="none bg-danger">
+        <tr id="et27.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft27.1')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.1')">ERROR</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft27.1" class="popup_window test_output" style="display:block;">
+                <div id="div_et27.1" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft27.1').style.display='none'"><span
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 472, in test_download_cover
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 471, in test_download_cover
+    self.fill_thumbnail_config({&#39;schedule_generate_book_covers&#39;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 238, in fill_thumbnail_config
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2574,9 +3547,73 @@ AssertionError: False is not true</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 412, in test_kobo_sync_multi_user
-    self.check_element_on_page((By.XPATH, &#34;//*[@id=&#39;archived_cb&#39;]&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 334, in test_kobo_sync_multi_user
+    self.create_user(&#39;user1&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;ada@b.com&#39;, &#34;edit_role&#34;: 1, &#34;download_role&#34;: 1})
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1008, in create_user
+    return cls.change_user(config)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1062, in change_user
+    ele = cls.driver.find_element(By.ID, checkbox)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2603,9 +3640,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 279, in test_kobo_sync_selected_shelves
-    self.check_element_on_page((By.ID, &#34;add-to-shelf&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 271, in test_kobo_sync_selected_shelves
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -2615,40 +3654,106 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt27.4' class='hiddenRow bg-success'>
+        <tr id="et27.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_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_et27.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 173, in test_sync_changed_book
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt27.5' class='hiddenRow bg-success'>
+        <tr id="et27.5" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</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_et27.5')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.5" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 248, in test_sync_reading_state
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt27.6' class='hiddenRow bg-success'>
+        <tr id="et27.6" class="none bg-info">
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</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_et27.6')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et27.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et27.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 204, in test_sync_shelf
+    self.inital_sync()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
+    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
+TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">13</td>
-        <td class="text-center">0</td>
+        <td class="text-center">10</td>
         <td class="text-center">0</td>
+        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c28', 13)">Detail</a>
@@ -2747,29 +3852,109 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id="et28.11" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</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_et28.11')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et28.11" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et28.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1047, in test_ldap_kobo_sync
+    self.check_element_on_page((By.ID, &#34;config_create_kobo_token&#34;)).click()
+AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id="et28.12" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</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_et28.12')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et28.12" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et28.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 922, in test_ldap_opds_anonymous
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id="et28.13" class="none bg-info">
             <td>
                 <div class='testcase'>TestLdapLogin - 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_et28.13')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et28.13" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et28.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 832, in test_ldap_opds_download_book
+    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
+    cls._fill_basic_config(elements)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
+    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
+    raise TimeoutException(message, screen, stacktrace)
+selenium.common.exceptions.TimeoutException: Message: 
+Stacktrace:
+WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
+NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
+element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2880,11 +4065,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="skipClass">
+    <tr id="su" class="failClass">
         <td>TestLogging</td>
         <td class="text-center">9</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
+        <td class="text-center">7</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -2912,11 +4097,33 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id="ft30.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</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_ft30.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft30.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft30.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_logging.py&#34;, line 249, in test_debuginfo_download
+    self.assertEqual(resp.headers[&#39;Content-Type&#39;], &#39;application/zip&#39;)
+AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
+- text/html; charset=utf-8
++ application/zip</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3176,11 +4383,11 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestOAuthLogin</td>
         <td class="text-center">2</td>
-        <td class="text-center">2</td>
-        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -3199,11 +4406,31 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
     
     
     
-        <tr id='pt33.2' class='hiddenRow bg-success'>
+        <tr id="ft33.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</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_ft33.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft33.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft33.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_oauth.py&#34;, line 53, in test_visible_oauth
+    self.assertTrue(self.check_element_on_page((By.ID, &#34;config_1_oauth&#34;)))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3506,12 +4733,12 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
+        <td class="text-center">4</td>
         <td class="text-center">0</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c37', 5)">Detail</a>
@@ -3547,11 +4774,33 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id='pt37.4' class='hiddenRow bg-success'>
+        <tr id="et37.4" class="none bg-info">
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</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_et37.4')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et37.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
+    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 197, in sound_test
+    self.assertTrue(os.path.splitext(file_name)[1][1:] in listen_button.text)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3701,12 +4950,12 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="errorClass">
         <td>TestReverseProxy</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">2</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c41', 3)">Detail</a>
@@ -3715,29 +4964,157 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
 
     
     
-        <tr id='pt41.1' class='hiddenRow bg-success'>
+        <tr id="et41.1" class="none bg-info">
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</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_et41.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
+    conn = connection.create_connection(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
+    raise err
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
+    sock.connect(sa)
+ConnectionRefusedError: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
+    httplib_response = self._make_request(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
+    conn.request(method, url, **httplib_request_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
+    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
+    self._send_request(method, url, body, headers, encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
+    self.endheaders(body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
+    self._send_output(message_body, encode_chunked=encode_chunked)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
+    self.send(msg)
+  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
+    self.connect()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
+    conn = self._new_conn()
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
+    raise NewConnectionError(
+urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
+
+During handling of the above exception, another exception occurred:
+
+Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 48, in test_logout
+    self.logout()
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 104, in logout
+    logout = cls.check_element_on_page((By.ID, &#34;logout&#34;))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 739, in check_element_on_page
+    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
+    value = method(self._driver)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
+    return driver.find_element(*locator)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
+    return self.execute(Command.FIND_ELEMENT, {
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
+    response = self.command_executor.execute(driver_command, params)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
+    return self._request(command_info[0], url, body=data)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
+    resp = self._conn.request(method, url, body=body, headers=headers)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
+    return self.request_encode_body(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
+    return self.urlopen(method, url, **extra_kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
+    response = conn.urlopen(method, u.request_uri, **kw)
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
+    return self.urlopen(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
+    retries = retries.increment(
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
+    raise MaxRetryError(_pool, url, error or ResponseError(cause))
+urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.2' class='hiddenRow bg-success'>
+        <tr id="ft41.2" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</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_ft41.2')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 56, in test_move_page
+    self.assertTrue(self.goto_page(&#34;admin_setup&#34;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
     
-        <tr id='pt41.3' class='hiddenRow bg-success'>
+        <tr id="ft41.3" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</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_ft41.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 45, in test_reverse_about
+    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3920,14 +5297,14 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
 
 
     <tr id="su" class="failClass">
-        <td>TestThumbnails</td>
-        <td class="text-center">8</td>
-        <td class="text-center">0</td>
-        <td class="text-center">7</td>
+        <td>TestThumbnailsEnv</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c43', 8)">Detail</a>
+            <a onclick="showClassDetail('c43', 1)">Detail</a>
         </td>
     </tr>
 
@@ -3935,7 +5312,7 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
         <tr id="ft43.1" class="none bg-danger">
             <td>
-                <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
+                <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
@@ -3950,191 +5327,8 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 210, in test_cache_non_writable
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.2" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 178, in test_cache_of_deleted_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.3" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 77, in test_cover_cache_on_database_change
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.4" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 117, in test_cover_change_on_upload_new_cover
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id='st43.5' class='none bg-warning'>
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_for_series</div>
-            </td>
-            <td colspan='6' align='center'>SKIP</td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.6" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 224, in test_cover_on_upload_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.7" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.7')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 152, in test_remove_cover_from_cache
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
-AssertionError: False is not true</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="ft43.8" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.8')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 262, in test_sideloaded_book
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 60, in test_cover_cache_env_on_database_change
+    self.assertTrue(os.path.exists(thumbail_cache_path))
 AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -4147,14 +5341,14 @@ AssertionError: False is not true</pre>
 
 
     <tr id="su" class="failClass">
-        <td>TestUpdater</td>
-        <td class="text-center">9</td>
-        <td class="text-center">7</td>
-        <td class="text-center">1</td>
+        <td>TestThumbnails</td>
+        <td class="text-center">8</td>
+        <td class="text-center">2</td>
+        <td class="text-center">5</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 9)">Detail</a>
+            <a onclick="showClassDetail('c44', 8)">Detail</a>
         </td>
     </tr>
 
@@ -4162,59 +5356,61 @@ AssertionError: False is not true</pre>
     
         <tr id='pt44.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
+                <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt44.2' class='hiddenRow bg-success'>
+        <tr id="ft44.2" class="none bg-danger">
             <td>
-                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt44.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="ft44.5" class="none bg-danger">
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update</div>
+                <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.5')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.2')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
+                <div id="div_ft44.2" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.5').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 359, in test_perform_update
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;flash_success&#34;)))
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 199, in test_cache_of_deleted_book
+    self.assertEqual(220, count_files(thumbnail_cache_path))
+AssertionError: 220 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.3" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.3')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.3" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 83, in test_cover_cache_on_database_change
+    self.assertTrue(os.path.exists(thumbnail_cache_path))
 AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
@@ -4225,32 +5421,26 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id="ft44.4" class="none bg-danger">
             <td>
-                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id="st44.7" class="none bg-warning">
-            <td>
-                <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
+                <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st44.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.4')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st44.7" class="popup_window test_output" style="display:none;">
+                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_st44.7').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.4').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
-                        <pre class="text-left">Takes too long</pre>
+                        <pre class="text-left">Traceback (most recent call last):
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 125, in test_cover_change_on_upload_new_cover
+    self.assertTrue(os.path.exists(thumbnail_cache_path))
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -4260,31 +5450,89 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.8' class='hiddenRow bg-success'>
+        <tr id='st44.5' class='none bg-warning'>
             <td>
-                <div class='testcase'>TestUpdater - test_reconnect_database</div>
+                <div class='testcase'>TestThumbnails - test_cover_for_series</div>
+            </td>
+            <td colspan='6' align='center'>SKIP</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
             <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt44.9' class='hiddenRow bg-success'>
+        <tr id="ft44.7" class="none bg-danger">
             <td>
-                <div class='testcase'>TestUpdater - test_update_write_protect</div>
+                <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.7')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.7" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 164, in test_remove_cover_from_cache
+    self.assertEqual(book_thumbnail_reference - 2, count_files(thumbnail_cache_path))
+AssertionError: -2 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.8" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.8')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.8" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 281, in test_sideloaded_book
+    self.assertEqual(book_thumbnail_reference + 2, count_files(thumbnail_cache_path))
+AssertionError: 2 != 0</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
             </td>
-            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestUploadEPubs</td>
         <td class="text-center">4</td>
-        <td class="text-center">3</td>
+        <td class="text-center">4</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c45', 4)">Detail</a>
@@ -4293,31 +5541,11 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id="et45.1" class="none bg-info">
+        <tr id='pt45.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadEPubs - test_upload_epub_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et45.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et45.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et45.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_upload_epubs.py&#34;, line 188, in test_upload_epub_cover
-    os.remove(&#39;cover_image.png&#39;)
-FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -5084,172 +6312,13 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
     
     
 
-
-    <tr id="su" class="passClass">
-        <td>TestCalibreHelper</td>
-        <td class="text-center">16</td>
-        <td class="text-center">16</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('c50', 16)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id='pt50.1' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.2' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.3' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.4' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.5' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.6' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.7' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.8' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.9' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.10' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.11' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.12' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.13' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.14' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_random_password</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.15' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-    
-        <tr id='pt50.16' class='hiddenRow bg-success'>
-            <td>
-                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
-            </td>
-            <td colspan='6' align='center'>PASS</td>
-        </tr>
-    
-    
-
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>420</td>
-        <td>389</td>
-        <td>14</td>
-        <td>10</td>
-        <td>7</td>
+        <td>401</td>
+        <td>356</td>
+        <td>12</td>
+        <td>27</td>
+        <td>6</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -5397,7 +6466,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>SQLAlchemy</th>
-              <td>1.4.35</td>
+              <td>1.4.36</td>
               <td>Basic</td>
             </tr>
           
@@ -5427,7 +6496,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestCliGdrivedb</td>
             </tr>
           
@@ -5457,7 +6526,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -5487,7 +6556,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
@@ -5529,7 +6598,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEditAuthorsGdrive</td>
             </tr>
           
@@ -5565,7 +6634,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -5607,7 +6676,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
           
             <tr>
               <th>google-api-python-client</th>
-              <td>2.45.0</td>
+              <td>2.46.0</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -5697,7 +6766,7 @@ FileNotFoundError: [Errno 2] No such file or directory: &#39;cover_image.png&#39
 </div>
 
 <script>
-    drawCircle(389, 14, 10, 7);
+    drawCircle(356, 12, 27, 6);
     showCase(5);
 </script>
 

From ef4b5e2881062199272a4ff7d577dffdade3b5ac Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 28 Apr 2022 21:40:48 +0200
Subject: [PATCH 216/220] Bugfix audio player Bugfix Debugfile export

---
 cps/config_sql.py         | 2 +-
 cps/templates/detail.html | 8 ++++----
 setup.cfg                 | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cps/config_sql.py b/cps/config_sql.py
index e20f7ac2..743b2ce7 100644
--- a/cps/config_sql.py
+++ b/cps/config_sql.py
@@ -296,7 +296,7 @@ class _ConfigSQL(object):
     def toDict(self):
         storage = {}
         for k, v in self.__dict__.items():
-            if k[0] != '_' and not k.endswith("password") and not k.endswith("secret"):
+            if k[0] != '_' and not k.endswith("password") and not k.endswith("secret") and not k == "cli":
                 storage[k] = v
         return storage
 
diff --git a/cps/templates/detail.html b/cps/templates/detail.html
index 5d7c846e..3af205fb 100644
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -71,9 +71,9 @@
                 {% endif %}
               </div>
             {% endif %}
-            {% if entry.audioentries|length > 0 and g.user.role_viewer() %}
+            {% if entry.audio_entries|length > 0 and g.user.role_viewer() %}
               <div class="btn-group" role="group">
-              {% if entry.audioentries|length > 1 %}
+              {% if entry.audio_entries|length > 1 %}
                 <button id="listen-in-browser" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                   <span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}}
                   <span class="caret"></span>
@@ -86,13 +86,13 @@
                   <ul class="dropdown-menu" aria-labelledby="listen-in-browser">
 
               {% for format in entry.data %}
-                  {% if format.format|lower in entry.audioentries %}
+                  {% if format.format|lower in entry.audio_entries %}
                     <li><a target="_blank" href="{{ url_for('web.read_book', book_id=entry.id, book_format=format.format|lower) }}">{{format.format|lower }}</a></li>
                     {% endif %}
               {% endfor %}
                   </ul>
                 {% else %}
-                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=entry.audioentries[0])}}" id="listenbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}} - {{entry.audioentries[0]}}</a>
+                  <a target="_blank" href="{{url_for('web.read_book', book_id=entry.id, book_format=entry.audio_entries[0])}}" id="listenbtn" class="btn btn-primary" role="button"><span class="glyphicon glyphicon-music"></span> {{_('Listen in Browser')}} - {{entry.audio_entries[0]}}</a>
                 {% endif %}
               </div>
             {% endif %}
diff --git a/setup.cfg b/setup.cfg
index 9daae0c9..aff22e9e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,7 @@ console_scripts =
 [options]
 include_package_data = True
 install_requires = 
-	APScheduler>=3.6.3,<3.8.0
+	APScheduler>=3.6.3,<3.10.0
 	werkzeug<2.1.0
 	Babel>=1.3,<3.0
 	Flask-Babel>=0.11.1,<2.1.0
@@ -62,7 +62,7 @@ install_requires =
 
 [options.extras_require]
 gdrive = 
-	google-api-python-client>=1.7.11,<2.46.0
+	google-api-python-client>=1.7.11,<2.50.0
 	gevent>20.6.0,<22.0.0
 	greenlet>=0.4.17,<1.2.0
 	httplib2>=0.9.2,<0.21.0
@@ -75,7 +75,7 @@ gdrive =
 	rsa>=3.4.2,<4.9.0
 gmail = 
 	google-auth-oauthlib>=0.4.3,<0.6.0
-	google-api-python-client>=1.7.11,<2.46.0
+	google-api-python-client>=1.7.11,<2.50.0
 goodreads = 
 	goodreads>=0.3.2,<0.4.0
 	python-Levenshtein>=0.12.0,<0.13.0

From 258b4a6767d23d288e228126fe925a69d542d03e Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Thu, 28 Apr 2022 21:43:26 +0200
Subject: [PATCH 217/220] Bugfix OAuth Login

---
 cps/main.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cps/main.py b/cps/main.py
index 16d288ac..d3591c06 100644
--- a/cps/main.py
+++ b/cps/main.py
@@ -22,13 +22,6 @@ from . import create_app
 from .jinjia import jinjia
 from .remotelogin import remotelogin
 
-try:
-    from oauth_bb import oauth
-    oauth_available = True
-except ImportError:
-    oauth_available = False
-
-
 def main():
     app = create_app()
 
@@ -50,6 +43,12 @@ def main():
     except (ImportError, AttributeError):  # Catch also error for not installed flask-WTF (missing csrf decorator)
         kobo_available = False
 
+    try:
+        from .oauth_bb import oauth
+        oauth_available = True
+    except ImportError:
+        oauth_available = False
+
     from . import web_server
     init_errorhandler()
 

From 5d5a94c9e59fcc66c19ed05cc495f2b30cc9e7c2 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Fri, 29 Apr 2022 18:16:37 +0200
Subject: [PATCH 218/220] Bugfix start as program

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

diff --git a/cps.py b/cps.py
index 91bb1d74..e4f9c520 100755
--- a/cps.py
+++ b/cps.py
@@ -20,16 +20,15 @@
 import os
 import sys
 
-# Are we running from commandline?
-if __package__ == '':
-    # Add local path to sys.path so we can import cps
-    path = os.path.dirname(os.path.dirname(__file__))
-    sys.path.insert(0, path)
 
-from cps.main import main as _main
+# Add local path to sys.path so we can import cps
+path = os.path.dirname(os.path.abspath(__file__))
+sys.path.insert(0, path)
+
+from cps.main import main
 
 if __name__ == '__main__':
-    _main()
+    main()
 
 
 
diff --git a/cps/__init__.py b/cps/__init__.py
index 3f92571b..1ba1f778 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -19,6 +19,8 @@
 #
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>.
+__package__ = "cps"
+
 import sys
 import os
 import mimetypes

From e8e4d87d398a4aa2c366fce48bbb399de21ae7e9 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sat, 30 Apr 2022 08:26:00 +0200
Subject: [PATCH 219/220] Bugfix session commit Bugfix get_locale Bugfix
 reconnect database schedule Bugfix no permission error message logging Bugfix
 updater

---
 cps/admin.py                            |    3 +-
 cps/db.py                               |    5 +-
 cps/fs.py                               |   12 +-
 cps/helper.py                           |    3 +-
 cps/schedule.py                         |    2 +-
 cps/tasks/convert.py                    |    6 +-
 cps/tasks/thumbnail.py                  |   39 +-
 cps/templates/schedule_edit.html        |    2 +-
 cps/updater.py                          |   18 +-
 test/Calibre-Web TestSummary_Linux.html | 2596 +++++------------------
 10 files changed, 585 insertions(+), 2101 deletions(-)

diff --git a/cps/admin.py b/cps/admin.py
index 91a16126..76275922 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -185,7 +185,6 @@ def update_thumbnails():
 @login_required
 @admin_required
 def admin():
-    locale = get_locale()
     version = updater_thread.get_current_version_info()
     if version is False:
         commit = _(u'Unknown')
@@ -1460,7 +1459,7 @@ def download_debug():
 def get_update_status():
     if feature_support['updater']:
         log.info(u"Update status requested")
-        return updater_thread.get_available_updates(request.method, locale=get_locale())
+        return updater_thread.get_available_updates(request.method)
     else:
         return ''
 
diff --git a/cps/db.py b/cps/db.py
index 21104622..f4dc4ccb 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -441,10 +441,13 @@ class CalibreDB:
     # instances alive once they reach the end of their respective scopes
     instances = WeakSet()
 
-    def __init__(self):
+    def __init__(self, expire_on_commit=True, init=False):
         """ Initialize a new CalibreDB session
         """
         self.session = None
+        if init:
+            self.init_db(expire_on_commit)
+
 
     def init_db(self, expire_on_commit=True):
         if self._init:
diff --git a/cps/fs.py b/cps/fs.py
index 2f83378d..996499c3 100644
--- a/cps/fs.py
+++ b/cps/fs.py
@@ -39,7 +39,7 @@ class FileSystem:
                 makedirs(self._cache_dir)
             except OSError:
                 self.log.info(f'Failed to create path {self._cache_dir} (Permission denied).')
-                return False
+                raise
 
         path = join(self._cache_dir, cache_type)
         if cache_type and not isdir(path):
@@ -47,7 +47,7 @@ class FileSystem:
                 makedirs(path)
             except OSError:
                 self.log.info(f'Failed to create path {path} (Permission denied).')
-                return False
+                raise
 
         return path if cache_type else self._cache_dir
 
@@ -58,7 +58,7 @@ class FileSystem:
                 makedirs(path)
             except OSError:
                 self.log.info(f'Failed to create path {path} (Permission denied).')
-                return False
+                raise
 
         return path
 
@@ -75,7 +75,7 @@ class FileSystem:
                 rmtree(self._cache_dir)
             except OSError:
                 self.log.info(f'Failed to delete path {self._cache_dir} (Permission denied).')
-                return False
+                raise
 
         path = join(self._cache_dir, cache_type)
         if cache_type and isdir(path):
@@ -83,7 +83,7 @@ class FileSystem:
                 rmtree(path)
             except OSError:
                 self.log.info(f'Failed to delete path {path} (Permission denied).')
-                return False
+                raise
 
     def delete_cache_file(self, filename, cache_type=None):
         path = self.get_cache_file_path(filename, cache_type)
@@ -92,4 +92,4 @@ class FileSystem:
                 remove(path)
             except OSError:
                 self.log.info(f'Failed to delete path {path} (Permission denied).')
-                return False
+                raise
diff --git a/cps/helper.py b/cps/helper.py
index 7362eb9e..757e48da 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -1015,8 +1015,7 @@ def replace_cover_thumbnail_cache(book_id):
 
 
 def delete_thumbnail_cache():
-    if config.schedule_generate_book_covers:
-        WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
+    WorkerThread.add(None, TaskClearCoverThumbnailCache(-1))
 
 
 def add_book_to_thumbnail_cache(book_id):
diff --git a/cps/schedule.py b/cps/schedule.py
index 9bc248f1..faadfb7e 100644
--- a/cps/schedule.py
+++ b/cps/schedule.py
@@ -62,7 +62,7 @@ def register_scheduled_tasks(reconnect=True):
         duration = config.schedule_duration
 
         # Register scheduled tasks
-        scheduler.schedule_tasks(tasks=get_scheduled_tasks(), trigger='cron', hour=start)
+        scheduler.schedule_tasks(tasks=get_scheduled_tasks(reconnect), trigger='cron', hour=start)
         end_time = calclulate_end_time(start, duration)
         scheduler.schedule(func=end_scheduled_tasks, trigger='cron', name="end scheduled task", hour=end_time.hour,
                            minute=end_time.minute)
diff --git a/cps/tasks/convert.py b/cps/tasks/convert.py
index bc7e928a..3062850d 100644
--- a/cps/tasks/convert.py
+++ b/cps/tasks/convert.py
@@ -55,8 +55,7 @@ class TaskConvert(CalibreTask):
     def run(self, worker_thread):
         self.worker_thread = worker_thread
         if config.config_use_google_drive:
-            worker_db = db.CalibreDB()
-            worker_db.init_db(expire_on_commit=False)
+            worker_db = db.CalibreDB(expire_on_commit=False, init=True)
             cur_book = worker_db.get_book(self.book_id)
             self.title = cur_book.title
             data = worker_db.get_book_format(self.book_id, self.settings['old_book_format'])
@@ -105,8 +104,7 @@ class TaskConvert(CalibreTask):
 
     def _convert_ebook_format(self):
         error_message = None
-        local_db = db.CalibreDB()
-        local_db.init_db(expire_on_commit=False)
+        local_db = db.CalibreDB(expire_on_commit=False, init=True)
         file_path = self.file_path
         book_id = self.book_id
         format_old_ext = u'.' + self.settings['old_book_format'].lower()
diff --git a/cps/tasks/thumbnail.py b/cps/tasks/thumbnail.py
index 2ecc57c8..ace9cecc 100644
--- a/cps/tasks/thumbnail.py
+++ b/cps/tasks/thumbnail.py
@@ -68,8 +68,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         self.log = logger.create()
         self.book_id = book_id
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB()
-        self.calibre_db.init_db(expire_on_commit=False)
+        # self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -77,7 +76,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
         ]
 
     def run(self, worker_thread):
-        if self.calibre_db.session and use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
+        if use_IM and self.stat != STAT_CANCELLED and self.stat != STAT_ENDED:
             self.message = 'Scanning Books'
             books_with_covers = self.get_books_with_covers(self.book_id)
             count = len(books_with_covers)
@@ -112,11 +111,10 @@ class TaskGenerateCoverThumbnails(CalibreTask):
 
     def get_books_with_covers(self, book_id=-1):
         filter_exp = (db.Books.id == book_id) if book_id != -1 else True
-        return self.calibre_db.session \
-            .query(db.Books) \
-            .filter(db.Books.has_cover == 1) \
-            .filter(filter_exp) \
-            .all()
+        calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+        books_cover = calibre_db.session.query(db.Books).filter(db.Books.has_cover == 1).filter(filter_exp).all()
+        calibre_db.session.close()
+        return books_cover
 
     def get_book_cover_thumbnails(self, book_id):
         return self.app_db_session \
@@ -160,7 +158,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self.log.debug('Error creating book thumbnail: ' + str(ex))
             self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -172,7 +170,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_book_thumbnail(book, thumbnail)
         except Exception as ex:
-            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self.log.debug('Error updating book thumbnail: ' + str(ex))
             self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -200,7 +198,7 @@ class TaskGenerateCoverThumbnails(CalibreTask):
                             img.save(filename=filename)
                 except Exception as ex:
                     # Bubble exception to calling function
-                    self.log.info('Error generating thumbnail file: ' + str(ex))
+                    self.log.debug('Error generating thumbnail file: ' + str(ex))
                     raise ex
                 finally:
                     if stream is not None:
@@ -239,8 +237,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
         super(TaskGenerateSeriesThumbnails, self).__init__(task_message)
         self.log = logger.create()
         self.app_db_session = ub.get_new_session_instance()
-        self.calibre_db = db.CalibreDB()
-        self.calibre_db.init_db(expire_on_commit=False)
+        self.calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
         self.cache = fs.FileSystem()
         self.resolutions = [
             constants.COVER_THUMBNAIL_SMALL,
@@ -337,7 +334,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.app_db_session.commit()
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info('Error creating book thumbnail: ' + str(ex))
+            self.log.debug('Error creating book thumbnail: ' + str(ex))
             self._handleError('Error creating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -349,7 +346,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
             self.cache.delete_cache_file(thumbnail.filename, constants.CACHE_TYPE_THUMBNAILS)
             self.generate_series_thumbnail(series_books, thumbnail)
         except Exception as ex:
-            self.log.info('Error updating book thumbnail: ' + str(ex))
+            self.log.debug('Error updating book thumbnail: ' + str(ex))
             self._handleError('Error updating book thumbnail: ' + str(ex))
             self.app_db_session.rollback()
 
@@ -393,7 +390,7 @@ class TaskGenerateSeriesThumbnails(CalibreTask):
                             canvas.composite(img, left, top)
 
                     except Exception as ex:
-                        self.log.info('Error generating thumbnail file: ' + str(ex))
+                        self.log.debug('Error generating thumbnail file: ' + str(ex))
                         raise ex
                     finally:
                         if stream is not None:
@@ -450,18 +447,18 @@ class TaskClearCoverThumbnailCache(CalibreTask):
         super(TaskClearCoverThumbnailCache, self).__init__(task_message)
         self.log = logger.create()
         self.book_id = book_id
-        self.calibre_db = db.CalibreDB()
-        self.calibre_db.init_db(expire_on_commit=False)
         self.app_db_session = ub.get_new_session_instance()
         self.cache = fs.FileSystem()
 
     def run(self, worker_thread):
         if self.app_db_session:
             if self.book_id == 0:  # delete superfluous thumbnails
-                thumbnails = (self.calibre_db.session.query(ub.Thumbnail)
+                calibre_db = db.CalibreDB(expire_on_commit=False, init=True)
+                thumbnails = (calibre_db.session.query(ub.Thumbnail)
                               .join(db.Books, ub.Thumbnail.entity_id == db.Books.id, isouter=True)
                               .filter(db.Books.id == None)
                               .all())
+                calibre_db.session.close()
             elif self.book_id > 0:  # make sure single book is selected
                 thumbnails = self.get_thumbnails_for_book(self.book_id)
             if self.book_id < 0:
@@ -489,7 +486,7 @@ class TaskClearCoverThumbnailCache(CalibreTask):
                 .delete()
             self.app_db_session.commit()
         except Exception as ex:
-            self.log.info('Error deleting book thumbnail: ' + str(ex))
+            self.log.debug('Error deleting book thumbnail: ' + str(ex))
             self._handleError('Error deleting book thumbnail: ' + str(ex))
 
     def delete_all_thumbnails(self):
@@ -498,7 +495,7 @@ class TaskClearCoverThumbnailCache(CalibreTask):
             self.app_db_session.commit()
             self.cache.delete_cache_dir(constants.CACHE_TYPE_THUMBNAILS)
         except Exception as ex:
-            self.log.info('Error deleting thumbnail directory: ' + str(ex))
+            self.log.debug('Error deleting thumbnail directory: ' + str(ex))
             self._handleError('Error deleting thumbnail directory: ' + str(ex))
 
     @property
diff --git a/cps/templates/schedule_edit.html b/cps/templates/schedule_edit.html
index 55658ce7..83dd6c68 100644
--- a/cps/templates/schedule_edit.html
+++ b/cps/templates/schedule_edit.html
@@ -33,7 +33,7 @@
       <label for="schedule_generate_series_covers">{{_('Generate Series Cover Thumbnails')}}</label>
     </div-->
     <div class="form-group">
-      <input type="checkbox" id="schedule_reconnect" name="schedule_reconnect" {% if config.schedule_generate_book_covers %}checked{% endif %}>
+      <input type="checkbox" id="schedule_reconnect" name="schedule_reconnect" {% if config.schedule_reconnect %}checked{% endif %}>
       <label for="schedule_reconnect">{{_('Reconnect to Calibre Library')}}</label>
     </div>
 
diff --git a/cps/updater.py b/cps/updater.py
index b47b80f5..757e43fc 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -67,10 +67,10 @@ class Updater(threading.Thread):
             return self._stable_version_info()
         return self._nightly_version_info()
 
-    def get_available_updates(self, request_method, locale):
+    def get_available_updates(self, request_method):
         if self.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)
 
     def do_work(self):
         try:
@@ -335,7 +335,7 @@ class Updater(threading.Thread):
         print("\n*** Finished ***")
 
     @staticmethod
-    def _populate_parent_commits(update_data, status, locale, tz, parents):
+    def _populate_parent_commits(update_data, status, tz, parents):
         try:
             parent_commit = update_data['parents'][0]
             # limit the maximum search depth
@@ -360,7 +360,7 @@ class Updater(threading.Thread):
                         parent_commit_date = datetime.datetime.strptime(
                             parent_data['committer']['date'], '%Y-%m-%dT%H:%M:%SZ') - tz
                         parent_commit_date = format_datetime(
-                            parent_commit_date, format='short', locale=locale)
+                            parent_commit_date, format='short')
 
                         parents.append([parent_commit_date,
                                         parent_data['message'].replace('\r\n', '<p>').replace('\n', '<p>')])
@@ -418,7 +418,7 @@ class Updater(threading.Thread):
             log_function("Excluded file list for updater not found, or not accessible")
         return excluded_files
 
-    def _nightly_available_updates(self, request_method, locale):
+    def _nightly_available_updates(self, request_method):
         tz = datetime.timedelta(seconds=time.timezone if (time.localtime().tm_isdst == 0) else time.altzone)
         if request_method == "GET":
             repository_url = _REPOSITORY_API_URL
@@ -459,14 +459,14 @@ class Updater(threading.Thread):
                     update_data['committer']['date'], '%Y-%m-%dT%H:%M:%SZ') - tz
                 parents.append(
                     [
-                        format_datetime(new_commit_date, format='short', locale=locale),
+                        format_datetime(new_commit_date, format='short'),
                         update_data['message'],
                         update_data['sha']
                     ]
                 )
                 # it only makes sense to analyze the parents if we know the current commit hash
                 if status['current_commit_hash'] != '':
-                    parents = self._populate_parent_commits(update_data, status, locale, tz, parents)
+                    parents = self._populate_parent_commits(update_data, status, tz, parents)
                 status['history'] = parents[::-1]
             except (IndexError, KeyError):
                 status['success'] = False
@@ -595,7 +595,7 @@ class Updater(threading.Thread):
         return json.dumps(status)
 
     def _get_request_path(self):
-        if config.config_updatechannel == constants.UPDATE_STABLE:
+        if self.config.config_updatechannel == constants.UPDATE_STABLE:
             return self.updateFile
         return _REPOSITORY_API_URL + '/zipball/master'
 
@@ -623,7 +623,7 @@ class Updater(threading.Thread):
                     status['message'] = _(u'HTTP Error') + ': ' + commit['message']
             else:
                 status['message'] = _(u'HTTP Error') + ': ' + str(e)
-        except requests.exceptions.ConnectionError:
+        except requests.exceptions.ConnectionError as e:
             status['message'] = _(u'Connection error')
         except requests.exceptions.Timeout:
             status['message'] = _(u'Timeout while establishing connection')
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index cf3e893d..913913b1 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-04-27 19:55:57</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-29 21:17:05</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>2022-04-28 01:28:47</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-04-30 03:15:20</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>4h 34 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>5h 5 min</p>
         </div>
       </div>
       </div>
@@ -600,8 +600,8 @@
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">7</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -611,11 +611,31 @@
 
     
     
-        <tr id='pt7.1' class='hiddenRow bg-success'>
+        <tr id="ft7.1" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</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_ft7.1')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 198, in test_convert_email
+    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -682,9 +702,9 @@
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 441, in test_thumbnail_cache
-    self.assertTrue(os.path.exists(thumbnail_cache_path))
-AssertionError: False is not true</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 442, in test_thumbnail_cache
+    self.assertEqual(10*2, count_files(thumbnail_cache_path))
+AssertionError: 20 != 0</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -1642,11 +1662,11 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="passClass">
+    <tr id="su" class="failClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">18</td>
-        <td class="text-center">18</td>
-        <td class="text-center">0</td>
+        <td class="text-center">17</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1809,11 +1829,31 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt16.18' class='hiddenRow bg-success'>
+        <tr id="ft16.18" class="none bg-danger">
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</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_ft16.18')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft16.18" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 931, in test_watch_metadata
+    self.assertNotIn(&#39;series&#39;, book)
+AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5/og?c=1651263008&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2145,12 +2185,12 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSync</td>
         <td class="text-center">11</td>
+        <td class="text-center">11</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
-        <td class="text-center">10</td>
         <td class="text-center">0</td>
         <td class="text-center">
             <a onclick="showClassDetail('c25', 11)">Detail</a>
@@ -2159,1610 +2199,190 @@ AssertionError: False is not true</pre>
 
     
     
-        <tr id="et25.1" class="none bg-info">
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 582, in test_book_download
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c4d49d0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft25.2" class="none bg-danger">
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft25.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft25.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft25.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 579, in test_kobo_about
-    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
-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>
     
     
     
-        <tr id="et25.3" class="none bg-info">
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_sync_selected_shelfs</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 601, in test_kobo_sync_selected_shelfs
-    data = self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfa7c10&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.4" class="none bg-info">
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_upload_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 651, in test_kobo_upload_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556c3f18b0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.5" class="none bg-info">
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.5').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 446, in test_shelves_add_remove_books
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e0fe880&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.6" class="none bg-info">
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.6').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 276, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17b130&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.7" class="none bg-info">
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.7')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.7" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.7').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 229, in test_sync_invalid
-    r = requests.post(self.kobo_adress+&#39;x/v1/auth/device&#39;, json=payload, timeout=10)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.8" class="none bg-info">
+        <tr id='pt25.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.8')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.8" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.8').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 513, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e17bbb0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.9" class="none bg-info">
+        <tr id='pt25.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.9')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 295, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df84580&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.10" class="none bg-info">
+        <tr id='pt25.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.10')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.10" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.10').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 242, in test_sync_unchanged
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e136400&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et25.11" class="none bg-info">
+        <tr id='pt25.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et25.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et25.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et25.11').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 256, in test_sync_upload
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 66, in inital_sync
-    self.get_book_details(5)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1453, in get_book_details
-    cls.driver.get(root_url + &#34;/book/&#34; + str(id))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556df22cd0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
-        <td class="text-center">5</td>
-        <td class="text-center">0</td>
-        <td class="text-center">
-            <a onclick="showClassDetail('c26', 5)">Detail</a>
-        </td>
-    </tr>
-
-    
-    
-        <tr id="et26.1" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_kobo_sync)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync.py&#34;, line 54, in tearDownClass
-    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=56063): Max retries exceeded with url: /session/21347810-0a1a-4767-8af4-ec8dc4e9d838/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556e71a3a0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.2" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_kobo_sync_big)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.2').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 61, in tearDownClass
-    cls.driver.get(&#34;http://127.0.0.1:8083&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f556dfafaf0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.3" class="none bg-info">
-            <td>
-                <div class='testcase'>tearDownClass (test_reverse_proxy)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 37, in tearDownClass
-    cls.driver.get(&#39;http://&#39; + get_Host_IP() + &#39;:8083&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 437, in get
-    self.execute(Command.GET, {&#39;url&#39;: url})
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/url (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff86280&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.4" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_updater)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 27, in setUpClass
-    cls.proxy = Proxy()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_proxy.py&#34;, line 305, in __init__
-    self.m = DumpMaster(opts, with_termlog=False, with_dumper=False)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/tools/dump.py&#34;, line 28, in __init__
-    self.addons.add(*addons.default_addons())
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 199, in add
-    self.chain.append(self.register(i))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 184, in register
-    self.invoke_addon(addon, LoadHook(l))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 264, in invoke_addon
-    func(*event.args())
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addons/proxyserver.py&#34;, line 101, in load
-    loader.add_option(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/addonmanager.py&#34;, line 91, in add_option
-    ctx.log.warn(&#34;Over-riding existing option %s&#34; % name)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 55, in warn
-    self(txt, &#34;warn&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/mitmproxy/log.py&#34;, line 64, in __call__
-    asyncio.get_event_loop().call_soon(
-  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 719, in call_soon
-    self._check_closed()
-  File &#34;/usr/lib/python3.8/asyncio/base_events.py&#34;, line 508, in _check_closed
-    raise RuntimeError(&#39;Event loop is closed&#39;)
-RuntimeError: Event loop is closed</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-    
-        <tr id="et26.5" class="none bg-info">
-            <td>
-                <div class='testcase'>setUpClass (test_zz_helper)</div>
-            </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et26.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et26.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et26.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 25, in setUpClass
-    from cps import helper, updater
-  File &#34;/home/ozzie/Development/calibre-web/cps/helper.py&#34;, line 53, in &lt;module&gt;
-    from .tasks.convert import TaskConvert
-  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/convert.py&#34;, line 36, in &lt;module&gt;
-    from cps.tasks.mail import TaskEmail
-  File &#34;/home/ozzie/Development/calibre-web/cps/tasks/mail.py&#34;, line 36, in &lt;module&gt;
-    from cps import gdriveutils
-  File &#34;/home/ozzie/Development/calibre-web/cps/gdriveutils.py&#34;, line 145, in &lt;module&gt;
-    engine = create_engine(&#39;sqlite:///{0}&#39;.format(cli_param.gd_path), echo=False)
-AttributeError: &#39;CliParameter&#39; object has no attribute &#39;gd_path&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
-        </tr>
-    
-    
-
-
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestKoboSyncBig</td>
         <td class="text-center">6</td>
-        <td class="text-center">0</td>
-        <td class="text-center">0</td>
         <td class="text-center">6</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('c27', 6)">Detail</a>
+            <a onclick="showClassDetail('c26', 6)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et27.1" class="none bg-info">
+        <tr id='pt26.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_download_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 471, in test_download_cover
-    self.fill_thumbnail_config({&#39;schedule_generate_book_covers&#39;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 238, in fill_thumbnail_config
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7e50&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.2" class="none bg-info">
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_multi_user</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.2').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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 334, in test_kobo_sync_multi_user
-    self.create_user(&#39;user1&#39;, {&#39;password&#39;: &#39;123&#39;, &#39;email&#39;: &#39;ada@b.com&#39;, &#34;edit_role&#34;: 1, &#34;download_role&#34;: 1})
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1008, in create_user
-    return cls.change_user(config)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 1062, in change_user
-    ele = cls.driver.find_element(By.ID, checkbox)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=47809): Max retries exceeded with url: /session/5fa54894-d9db-4e84-ae80-296a5f6c85fb/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555fed7910&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.3" class="none bg-info">
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_kobo_sync_selected_shelves</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.3')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 271, in test_kobo_sync_selected_shelves
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.4" class="none bg-info">
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_changed_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 173, in test_sync_changed_book
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.5" class="none bg-info">
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_reading_state</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.5')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 248, in test_sync_reading_state
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et27.6" class="none bg-info">
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSyncBig - test_sync_shelf</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et27.6')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et27.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et27.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 204, in test_sync_shelf
-    self.inital_sync()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_kobo_sync_big.py&#34;, line 82, in inital_sync
-    r = requests.post(kobo_address + &#39;/v1/auth/device&#39;, json=payload, timeout=1000)
-TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestLdapLogin</td>
         <td class="text-center">13</td>
-        <td class="text-center">10</td>
+        <td class="text-center">13</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">3</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 13)">Detail</a>
+            <a onclick="showClassDetail('c27', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt27.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -3771,7 +2391,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -3780,7 +2400,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -3789,7 +2409,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -3798,7 +2418,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -3807,7 +2427,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -3816,7 +2436,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt27.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -3825,7 +2445,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -3834,7 +2454,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt27.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -3843,7 +2463,7 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt27.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -3852,109 +2472,29 @@ TypeError: unsupported operand type(s) for +: &#39;NoneType&#39; and &#39;str&#3
     
     
     
-        <tr id="et28.11" class="none bg-info">
+        <tr id='pt27.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.11')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.11" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et28.11').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 1047, in test_ldap_kobo_sync
-    self.check_element_on_page((By.ID, &#34;config_create_kobo_token&#34;)).click()
-AttributeError: &#39;bool&#39; object has no attribute &#39;click&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et28.12" class="none bg-info">
+        <tr id='pt27.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et28.12')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.12" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et28.12').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 922, in test_ldap_opds_anonymous
-    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="et28.13" class="none bg-info">
+        <tr id='pt27.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - 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_et28.13')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et28.13" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et28.13').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ldap.py&#34;, line 832, in test_ldap_opds_download_book
-    self.fill_basic_config({&#39;config_ldap_provider_url&#39;: &#39;127.0.0.1&#39;,
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 387, in fill_basic_config
-    cls._fill_basic_config(elements)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 297, in _fill_basic_config
-    WebDriverWait(cls.driver, 5).until(EC.presence_of_element_located((By.ID, &#34;config_port&#34;)))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 89, in until
-    raise TimeoutException(message, screen, stacktrace)
-selenium.common.exceptions.TimeoutException: Message: 
-Stacktrace:
-WebDriverError@chrome://remote/content/shared/webdriver/Errors.jsm:183:5
-NoSuchElementError@chrome://remote/content/shared/webdriver/Errors.jsm:395:5
-element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3968,13 +2508,13 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 10)">Detail</a>
+            <a onclick="showClassDetail('c28', 10)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_author_sort</div>
             </td>
@@ -3983,7 +2523,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt28.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_download_sort</div>
             </td>
@@ -3992,7 +2532,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt28.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_format_sort</div>
             </td>
@@ -4001,7 +2541,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt28.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_lang_sort</div>
             </td>
@@ -4010,7 +2550,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt28.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_authors_all_links</div>
             </td>
@@ -4019,7 +2559,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt28.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_order_series_all_links</div>
             </td>
@@ -4028,7 +2568,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt28.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_publisher_sort</div>
             </td>
@@ -4037,7 +2577,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt28.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_ratings_sort</div>
             </td>
@@ -4046,7 +2586,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt28.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_series_sort</div>
             </td>
@@ -4055,7 +2595,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt28.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebListOrders - test_tags_sort</div>
             </td>
@@ -4065,21 +2605,21 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="skipClass">
         <td>TestLogging</td>
         <td class="text-center">9</td>
-        <td class="text-center">7</td>
-        <td class="text-center">1</td>
+        <td class="text-center">8</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('c30', 9)">Detail</a>
+            <a onclick="showClassDetail('c29', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_access_log_recover</div>
             </td>
@@ -4088,7 +2628,7 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -4097,38 +2637,16 @@ element.find/&lt;/&lt;@chrome://remote/content/marionette/element.js:300:16</pre
     
     
     
-        <tr id="ft30.3" class="none bg-danger">
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debuginfo_download</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft30.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft30.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft30.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_logging.py&#34;, line 249, in test_debuginfo_download
-    self.assertEqual(resp.headers[&#39;Content-Type&#39;], &#39;application/zip&#39;)
-AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
-- text/html; charset=utf-8
-+ application/zip</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -4137,19 +2655,19 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id="st30.5" class="none bg-warning">
+        <tr id="st29.5" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st30.5')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st29.5')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st30.5" class="popup_window test_output" style="display:none;">
+                <div id="div_st29.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_st30.5').style.display='none'"><span
+                                onclick="document.getElementById('div_st29.5').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -4163,7 +2681,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logbook_download</div>
             </td>
@@ -4172,7 +2690,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -4181,7 +2699,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -4190,7 +2708,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -4208,13 +2726,13 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c31', 15)">Detail</a>
+            <a onclick="showClassDetail('c30', 15)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt31.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -4223,7 +2741,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -4232,7 +2750,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_cookie_steal</div>
             </td>
@@ -4241,7 +2759,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -4250,7 +2768,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -4259,7 +2777,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -4268,7 +2786,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -4277,7 +2795,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -4286,7 +2804,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -4295,7 +2813,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -4304,7 +2822,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -4313,7 +2831,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -4322,7 +2840,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -4331,7 +2849,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_proxy_login</div>
             </td>
@@ -4340,7 +2858,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt31.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -4358,13 +2876,13 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c32', 2)">Detail</a>
+            <a onclick="showClassDetail('c31', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt32.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_book_merge</div>
             </td>
@@ -4373,7 +2891,7 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id='pt32.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestMergeBooksList - test_delete_book</div>
             </td>
@@ -4383,21 +2901,21 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestOAuthLogin</td>
         <td class="text-center">2</td>
-        <td class="text-center">1</td>
-        <td class="text-center">1</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">
-            <a onclick="showClassDetail('c33', 2)">Detail</a>
+            <a onclick="showClassDetail('c32', 2)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt33.1' class='hiddenRow bg-success'>
+        <tr id='pt32.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -4406,31 +2924,11 @@ AssertionError: &#39;text/html; charset=utf-8&#39; != &#39;application/zip&#39;
     
     
     
-        <tr id="ft33.2" class="none bg-danger">
+        <tr id='pt32.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft33.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft33.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft33.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_oauth.py&#34;, line 53, in test_visible_oauth
-    self.assertTrue(self.check_element_on_page((By.ID, &#34;config_1_oauth&#34;)))
-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>
     
     
@@ -4444,13 +2942,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c34', 23)">Detail</a>
+            <a onclick="showClassDetail('c33', 23)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt34.1' class='hiddenRow bg-success'>
+        <tr id='pt33.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -4459,7 +2957,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.2' class='hiddenRow bg-success'>
+        <tr id='pt33.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -4468,7 +2966,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.3' class='hiddenRow bg-success'>
+        <tr id='pt33.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_books</div>
             </td>
@@ -4477,7 +2975,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.4' class='hiddenRow bg-success'>
+        <tr id='pt33.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -4486,7 +2984,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.5' class='hiddenRow bg-success'>
+        <tr id='pt33.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_colon_password</div>
             </td>
@@ -4495,7 +2993,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.6' class='hiddenRow bg-success'>
+        <tr id='pt33.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -4504,7 +3002,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.7' class='hiddenRow bg-success'>
+        <tr id='pt33.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -4513,7 +3011,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.8' class='hiddenRow bg-success'>
+        <tr id='pt33.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -4522,7 +3020,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.9' class='hiddenRow bg-success'>
+        <tr id='pt33.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -4531,7 +3029,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.10' class='hiddenRow bg-success'>
+        <tr id='pt33.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -4540,7 +3038,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.11' class='hiddenRow bg-success'>
+        <tr id='pt33.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -4549,7 +3047,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.12' class='hiddenRow bg-success'>
+        <tr id='pt33.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -4558,7 +3056,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.13' class='hiddenRow bg-success'>
+        <tr id='pt33.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -4567,7 +3065,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.14' class='hiddenRow bg-success'>
+        <tr id='pt33.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -4576,7 +3074,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.15' class='hiddenRow bg-success'>
+        <tr id='pt33.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -4585,7 +3083,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.16' class='hiddenRow bg-success'>
+        <tr id='pt33.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -4594,7 +3092,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.17' class='hiddenRow bg-success'>
+        <tr id='pt33.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -4603,7 +3101,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.18' class='hiddenRow bg-success'>
+        <tr id='pt33.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -4612,7 +3110,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.19' class='hiddenRow bg-success'>
+        <tr id='pt33.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -4621,7 +3119,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.20' class='hiddenRow bg-success'>
+        <tr id='pt33.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -4630,7 +3128,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.21' class='hiddenRow bg-success'>
+        <tr id='pt33.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -4639,7 +3137,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.22' class='hiddenRow bg-success'>
+        <tr id='pt33.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -4648,7 +3146,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt34.23' class='hiddenRow bg-success'>
+        <tr id='pt33.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -4666,13 +3164,13 @@ AssertionError: False is not true</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c35', 1)">Detail</a>
+            <a onclick="showClassDetail('c34', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt35.1' class='hiddenRow bg-success'>
+        <tr id='pt34.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUploadPDF - test_upload_invalid_pdf</div>
             </td>
@@ -4682,72 +3180,63 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_FailedTest</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="passClass">
+        <td>TestPipInstall</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">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c36', 1)">Detail</a>
+            <a onclick="showClassDetail('c35', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et36.1" class="none bg-info">
+        <tr id='pt35.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>_FailedTest - test_pip_install</div>
+                <div class='testcase'>TestPipInstall - test_command_start</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et36.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et36.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et36.1').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">ImportError: Failed to import test module: test_pip_install
-Traceback (most recent call last):
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 436, in _find_test_path
-    module = self._get_module_from_name(name)
-  File &#34;/usr/lib/python3.8/unittest/loader.py&#34;, line 377, in _get_module_from_name
-    __import__(name)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_pip_install.py&#34;, line 15, in &lt;module&gt;
-    from build import make_release
-  File &#34;/home/ozzie/Development/calibre-web-test/build/make_release.py&#34;, line 14, in &lt;module&gt;
-    from helper_environment import environment, add_dependency
-ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_environment&#39; (/home/ozzie/Development/calibre-web-test/test/helper_environment.py)</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt35.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_foldername_database_location</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt35.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestPipInstall - test_module_start</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestReader</td>
         <td class="text-center">5</td>
-        <td class="text-center">4</td>
+        <td class="text-center">5</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c37', 5)">Detail</a>
+            <a onclick="showClassDetail('c36', 5)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt37.1' class='hiddenRow bg-success'>
+        <tr id='pt36.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_comic_reader</div>
             </td>
@@ -4756,7 +3245,7 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id='pt37.2' class='hiddenRow bg-success'>
+        <tr id='pt36.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -4765,7 +3254,7 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id='pt37.3' class='hiddenRow bg-success'>
+        <tr id='pt36.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -4774,38 +3263,16 @@ ImportError: cannot import name &#39;add_dependency&#39; from &#39;helper_enviro
     
     
     
-        <tr id="et37.4" class="none bg-info">
+        <tr id='pt36.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et37.4')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et37.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et37.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 230, in test_sound_listener
-    self.sound_test(&#39;music.flac&#39;, &#39;Unknown - music&#39;, &#39;0:02&#39;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reader.py&#34;, line 197, in sound_test
-    self.assertTrue(os.path.splitext(file_name)[1][1:] in listen_button.text)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id='pt37.5' class='hiddenRow bg-success'>
+        <tr id='pt36.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_txt_reader</div>
             </td>
@@ -4823,13 +3290,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c38', 1)">Detail</a>
+            <a onclick="showClassDetail('c37', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt38.1' class='hiddenRow bg-success'>
+        <tr id='pt37.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReadOnlyDatabase - test_readonly_path</div>
             </td>
@@ -4847,13 +3314,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c39', 1)">Detail</a>
+            <a onclick="showClassDetail('c38', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt39.1' class='hiddenRow bg-success'>
+        <tr id='pt38.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReconnect - test_reconnect_endpoint</div>
             </td>
@@ -4871,13 +3338,13 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c40', 8)">Detail</a>
+            <a onclick="showClassDetail('c39', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt40.1' class='hiddenRow bg-success'>
+        <tr id='pt39.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -4886,7 +3353,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.2' class='hiddenRow bg-success'>
+        <tr id='pt39.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_illegal_email</div>
             </td>
@@ -4895,7 +3362,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.3' class='hiddenRow bg-success'>
+        <tr id='pt39.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -4904,7 +3371,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.4' class='hiddenRow bg-success'>
+        <tr id='pt39.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -4913,7 +3380,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.5' class='hiddenRow bg-success'>
+        <tr id='pt39.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -4922,7 +3389,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.6' class='hiddenRow bg-success'>
+        <tr id='pt39.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -4931,7 +3398,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.7' class='hiddenRow bg-success'>
+        <tr id='pt39.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -4940,7 +3407,7 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id='pt40.8' class='hiddenRow bg-success'>
+        <tr id='pt39.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -4950,171 +3417,43 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="passClass">
         <td>TestReverseProxy</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">2</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c41', 3)">Detail</a>
+            <a onclick="showClassDetail('c40', 3)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et41.1" class="none bg-info">
+        <tr id='pt40.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_logout</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et41.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et41.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et41.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 &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 174, in _new_conn
-    conn = connection.create_connection(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 95, in create_connection
-    raise err
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/connection.py&#34;, line 85, in create_connection
-    sock.connect(sa)
-ConnectionRefusedError: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 703, in urlopen
-    httplib_response = self._make_request(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 398, in _make_request
-    conn.request(method, url, **httplib_request_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 239, in request
-    super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1256, in request
-    self._send_request(method, url, body, headers, encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1302, in _send_request
-    self.endheaders(body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1251, in endheaders
-    self._send_output(message_body, encode_chunked=encode_chunked)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 1011, in _send_output
-    self.send(msg)
-  File &#34;/usr/lib/python3.8/http/client.py&#34;, line 951, in send
-    self.connect()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 205, in connect
-    conn = self._new_conn()
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connection.py&#34;, line 186, in _new_conn
-    raise NewConnectionError(
-urllib3.exceptions.NewConnectionError: &lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused
-
-During handling of the above exception, another exception occurred:
-
-Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 48, in test_logout
-    self.logout()
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 104, in logout
-    logout = cls.check_element_on_page((By.ID, &#34;logout&#34;))
-  File &#34;/home/ozzie/Development/calibre-web-test/test/helper_ui.py&#34;, line 739, in check_element_on_page
-    el = WebDriverWait(cls.driver, timeout).until(EC.presence_of_element_located(element))
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/wait.py&#34;, line 78, in until
-    value = method(self._driver)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/support/expected_conditions.py&#34;, line 64, in _predicate
-    return driver.find_element(*locator)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 1248, in find_element
-    return self.execute(Command.FIND_ELEMENT, {
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/webdriver.py&#34;, line 423, in execute
-    response = self.command_executor.execute(driver_command, params)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 316, in execute
-    return self._request(command_info[0], url, body=data)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/selenium/webdriver/remote/remote_connection.py&#34;, line 338, in _request
-    resp = self._conn.request(method, url, body=body, headers=headers)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 78, in request
-    return self.request_encode_body(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/request.py&#34;, line 170, in request_encode_body
-    return self.urlopen(method, url, **extra_kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/poolmanager.py&#34;, line 375, in urlopen
-    response = conn.urlopen(method, u.request_uri, **kw)
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 813, in urlopen
-    return self.urlopen(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/connectionpool.py&#34;, line 785, in urlopen
-    retries = retries.increment(
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/urllib3/util/retry.py&#34;, line 592, in increment
-    raise MaxRetryError(_pool, url, error or ResponseError(cause))
-urllib3.exceptions.MaxRetryError: HTTPConnectionPool(host=&#39;localhost&#39;, port=58627): Max retries exceeded with url: /session/d45b05f4-c689-4cdf-9ed6-19561cd0e50e/element (Caused by NewConnectionError(&#39;&lt;urllib3.connection.HTTPConnection object at 0x7f555ff994f0&gt;: Failed to establish a new connection: [Errno 111] Connection refused&#39;))</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft41.2" class="none bg-danger">
+        <tr id='pt40.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_move_page</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 56, in test_move_page
-    self.assertTrue(self.goto_page(&#34;admin_setup&#34;))
-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>
     
     
     
-        <tr id="ft41.3" class="none bg-danger">
+        <tr id='pt40.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReverseProxy - test_reverse_about</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft41.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft41.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft41.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_reverse_proxy.py&#34;, line 45, in test_reverse_about
-    self.assertTrue(self.goto_page(&#39;nav_about&#39;))
-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>
     
     
@@ -5128,13 +3467,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('c42', 16)">Detail</a>
+            <a onclick="showClassDetail('c41', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt42.1' class='hiddenRow bg-success'>
+        <tr id='pt41.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_access_shelf</div>
             </td>
@@ -5143,7 +3482,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.2' class='hiddenRow bg-success'>
+        <tr id='pt41.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -5152,7 +3491,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.3' class='hiddenRow bg-success'>
+        <tr id='pt41.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_adv_search_shelf</div>
             </td>
@@ -5161,7 +3500,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.4' class='hiddenRow bg-success'>
+        <tr id='pt41.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -5170,7 +3509,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.5' class='hiddenRow bg-success'>
+        <tr id='pt41.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf</div>
             </td>
@@ -5179,7 +3518,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.6' class='hiddenRow bg-success'>
+        <tr id='pt41.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_create_public_shelf_no_permission</div>
             </td>
@@ -5188,7 +3527,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.7' class='hiddenRow bg-success'>
+        <tr id='pt41.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -5197,7 +3536,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.8' class='hiddenRow bg-success'>
+        <tr id='pt41.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -5206,7 +3545,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.9' class='hiddenRow bg-success'>
+        <tr id='pt41.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -5215,7 +3554,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.10' class='hiddenRow bg-success'>
+        <tr id='pt41.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -5224,7 +3563,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.11' class='hiddenRow bg-success'>
+        <tr id='pt41.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -5233,7 +3572,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.12' class='hiddenRow bg-success'>
+        <tr id='pt41.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -5242,7 +3581,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.13' class='hiddenRow bg-success'>
+        <tr id='pt41.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -5251,19 +3590,19 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="st42.14" class="none bg-warning">
+        <tr id="st41.14" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st42.14')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st41.14')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st42.14" class="popup_window test_output" style="display:none;">
+                <div id="div_st41.14" 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_st42.14').style.display='none'"><span
+                                onclick="document.getElementById('div_st41.14').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -5277,7 +3616,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.15' class='hiddenRow bg-success'>
+        <tr id='pt41.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -5286,7 +3625,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt42.16' class='hiddenRow bg-success'>
+        <tr id='pt41.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_xss_shelf</div>
             </td>
@@ -5296,45 +3635,25 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestThumbnailsEnv</td>
         <td class="text-center">1</td>
-        <td class="text-center">0</td>
         <td class="text-center">1</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('c43', 1)">Detail</a>
+            <a onclick="showClassDetail('c42', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="ft43.1" class="none bg-danger">
+        <tr id='pt42.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnailsEnv - test_cover_cache_env_on_database_change</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft43.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnail_env.py&#34;, line 60, in test_cover_cache_env_on_database_change
-    self.assertTrue(os.path.exists(thumbail_cache_path))
-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>
     
     
@@ -5343,18 +3662,18 @@ AssertionError: False is not true</pre>
     <tr id="su" class="failClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">2</td>
-        <td class="text-center">5</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c44', 8)">Detail</a>
+            <a onclick="showClassDetail('c43', 8)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt44.1' class='hiddenRow bg-success'>
+        <tr id='pt43.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_non_writable</div>
             </td>
@@ -5363,94 +3682,34 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft44.2" class="none bg-danger">
+        <tr id='pt43.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cache_of_deleted_book</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.2')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 199, in test_cache_of_deleted_book
-    self.assertEqual(220, count_files(thumbnail_cache_path))
-AssertionError: 220 != 0</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
     
-        <tr id="ft44.3" class="none bg-danger">
+        <tr id='pt43.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_cache_on_database_change</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.3')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.3" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 83, in test_cover_cache_on_database_change
-    self.assertTrue(os.path.exists(thumbnail_cache_path))
-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>
     
     
     
-        <tr id="ft44.4" class="none bg-danger">
+        <tr id='pt43.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.4')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.4" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 125, in test_cover_change_on_upload_new_cover
-    self.assertTrue(os.path.exists(thumbnail_cache_path))
-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>
     
     
     
-        <tr id='st44.5' class='none bg-warning'>
+        <tr id='st43.5' class='none bg-warning'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_for_series</div>
             </td>
@@ -5459,7 +3718,7 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id='pt44.6' class='hiddenRow bg-success'>
+        <tr id='pt43.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_on_upload_book</div>
             </td>
@@ -5468,26 +3727,90 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft44.7" class="none bg-danger">
+        <tr id='pt43.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestThumbnails - test_remove_cover_from_cache</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft43.8" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+            </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.7')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft43.8')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.7" class="popup_window test_output" style="display:block;">
+                <div id="div_ft43.8" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.7').style.display='none'"><span
+                                onclick="document.getElementById('div_ft43.8').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 164, in test_remove_cover_from_cache
-    self.assertEqual(book_thumbnail_reference - 2, count_files(thumbnail_cache_path))
-AssertionError: -2 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 310, in test_sideloaded_book
+    self.assertAlmostEqual(diff(BytesIO(list_cover), BytesIO(old_list_cover), delete_diff_file=True), 0.0,
+AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.005138437597261127 difference)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
+
+    <tr id="su" class="errorClass">
+        <td>TestUpdater</td>
+        <td class="text-center">9</td>
+        <td class="text-center">4</td>
+        <td class="text-center">3</td>
+        <td class="text-center">1</td>
+        <td class="text-center">1</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c44', 9)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt44.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_errors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="et44.2" class="none bg-info">
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et44.2')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et44.2" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et44.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 268, in test_check_update_nightly_request_errors
+    self.check_updater(&#39;Could not fetch&#39;, &#34;alert&#34;)
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 76, in check_updater
+    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
+AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -5497,26 +3820,137 @@ AssertionError: -2 != 0</pre>
     
     
     
-        <tr id="ft44.8" class="none bg-danger">
+        <tr id='pt44.3' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>TestThumbnails - test_sideloaded_book</div>
+                <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.5" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.8')">FAIL</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.5')">FAIL</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_ft44.8" class="popup_window test_output" style="display:block;">
+                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.8').style.display='none'"><span
+                                onclick="document.getElementById('div_ft44.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 281, in test_sideloaded_book
-    self.assertEqual(book_thumbnail_reference + 2, count_files(thumbnail_cache_path))
-AssertionError: 2 != 0</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 363, in test_perform_update
+    self.assertTrue(thumbail_cache_path)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.6" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.6')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.6" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 321, in test_perform_update_stable_errors
+    self.assertTrue(&#39;HTTP Error&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
+AssertionError: False is not true</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id="st44.7" class="none bg-warning">
+            <td>
+                <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st44.7')">SKIP</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_st44.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_st44.7').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Takes too long</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt44.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestUpdater - test_reconnect_database</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft44.9" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestUpdater - test_update_write_protect</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.9')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft44.9" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 424, in test_update_write_protect
+    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
+AssertionError: False is not true</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -6312,13 +4746,67 @@ AssertionError: 2 != 0</pre>
     
     
 
+
+    <tr id="su" class="errorClass">
+        <td>_ErrorHolder</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">0</td>
+        <td class="text-center">1</td>
+        <td class="text-center">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c50', 1)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id="et50.1" class="none bg-info">
+            <td>
+                <div class='testcase'>setUpClass (test_zz_helper)</div>
+            </td>
+            <td colspan='6'>
+                <div class="text-center">
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et50.1')">ERROR</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_et50.1" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_et50.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 30, in setUpClass
+    from cps import cli_param
+  File &#34;/home/ozzie/Development/calibre-web/cps/__init__.py&#34;, line 29, in &lt;module&gt;
+    from .MyLoginManager import MyLoginManager
+  File &#34;/home/ozzie/Development/calibre-web/cps/MyLoginManager.py&#34;, line 24, in &lt;module&gt;
+    from flask_login import LoginManager
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/__init__.py&#34;, line 16, in &lt;module&gt;
+    from .login_manager import LoginManager
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/login_manager.py&#34;, line 24, in &lt;module&gt;
+    from .utils import (login_url as make_login_url, _create_identifier,
+  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/utils.py&#34;, line 13, in &lt;module&gt;
+    from werkzeug.security import safe_str_cmp
+ImportError: cannot import name &#39;safe_str_cmp&#39; from &#39;werkzeug.security&#39; (/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/werkzeug/security.py)</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>401</td>
-        <td>356</td>
-        <td>12</td>
-        <td>27</td>
-        <td>6</td>
+        <td>408</td>
+        <td>392</td>
+        <td>7</td>
+        <td>2</td>
+        <td>7</td>
         <td>&nbsp;</td>
     </tr>
 </table>
@@ -6430,7 +4918,7 @@ AssertionError: 2 != 0</pre>
           
             <tr>
               <th>Jinja2</th>
-              <td>3.1.1</td>
+              <td>3.1.2</td>
               <td>Basic</td>
             </tr>
           
@@ -6766,7 +5254,7 @@ AssertionError: 2 != 0</pre>
 </div>
 
 <script>
-    drawCircle(356, 12, 27, 6);
+    drawCircle(392, 7, 2, 7);
     showCase(5);
 </script>
 

From 12f3a13d1da3205e5f8c27edcae0c628c6510656 Mon Sep 17 00:00:00 2001
From: Ozzie Isaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 1 May 2022 10:25:07 +0200
Subject: [PATCH 220/220] Fix typo Fix missing maim.py file in update pypi
 package Bugfix after last testrun

---
 cps/helper.py                           |   4 +-
 cps/updater.py                          |   3 +-
 test/Calibre-Web TestSummary_Linux.html | 395 ++++++++++++------------
 3 files changed, 203 insertions(+), 199 deletions(-)

diff --git a/cps/helper.py b/cps/helper.py
index 757e48da..ed11e1c0 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -804,8 +804,8 @@ def save_cover_from_url(url, book_path):
         elif use_advocate:
             img = advocate.get(url, timeout=(10, 200), allow_redirects=False)      # ToDo: Error Handling
         else:
-            log.error("python modul advocate is not installed but is needed")
-            return False, _("Python modul 'advocate' is not installed but is needed for cover downloads")
+            log.error("python module advocate is not installed but is needed")
+            return False, _("Python module 'advocate' is not installed but is needed for cover downloads")
         img.raise_for_status()
         return save_cover(img, book_path)
     except (socket.gaierror,
diff --git a/cps/updater.py b/cps/updater.py
index 757e43fc..13d774bf 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -266,8 +266,9 @@ class Updater(threading.Thread):
         if additional_path:
             exclude.append(additional_path)
         exclude = tuple(exclude)
-        # check if we are in a package, rename cps.py to __init__.py
+        # check if we are in a package, rename cps.py to __init__.py and __main__.py
         if constants.HOME_CONFIG:
+            shutil.copy(os.path.join(source, 'cps.py'), os.path.join(source, '__main__.py'))
             shutil.move(os.path.join(source, 'cps.py'), os.path.join(source, '__init__.py'))
 
         for root, dirs, files in os.walk(destination, topdown=True):
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 913913b1..027aaa81 100644
--- a/test/Calibre-Web TestSummary_Linux.html	
+++ b/test/Calibre-Web TestSummary_Linux.html	
@@ -37,20 +37,20 @@
       <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>2022-04-29 21:17:05</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2022-04-30 21:05: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>2022-04-30 03:15:20</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2022-05-01 02:54:00</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>5h 5 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>4h 55 min</p>
         </div>
       </div>
       </div>
@@ -600,8 +600,8 @@
     <tr id="su" class="failClass">
         <td>TestEbookConvertCalibreGDrive</td>
         <td class="text-center">7</td>
-        <td class="text-center">5</td>
-        <td class="text-center">2</td>
+        <td class="text-center">6</td>
+        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -611,31 +611,11 @@
 
     
     
-        <tr id="ft7.1" class="none bg-danger">
+        <tr id='pt7.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEbookConvertCalibreGDrive - test_convert_email</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft7.1')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft7.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft7.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 198, in test_convert_email
-    self.assertTrue(&#34;E-mail&#34; in ret[-1][&#39;task&#39;])
-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>
     
     
@@ -702,7 +682,7 @@ AssertionError: False is not true</pre>
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 442, in test_thumbnail_cache
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_ebook_convert_gdrive.py&#34;, line 443, in test_thumbnail_cache
     self.assertEqual(10*2, count_files(thumbnail_cache_path))
 AssertionError: 20 != 0</pre>
                     </div>
@@ -1662,11 +1642,11 @@ AssertionError: 20 != 0</pre>
     
 
 
-    <tr id="su" class="failClass">
+    <tr id="su" class="passClass">
         <td>TestEditBooksOnGdrive</td>
         <td class="text-center">18</td>
-        <td class="text-center">17</td>
-        <td class="text-center">1</td>
+        <td class="text-center">18</td>
+        <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
@@ -1829,31 +1809,11 @@ AssertionError: 20 != 0</pre>
     
     
     
-        <tr id="ft16.18" class="none bg-danger">
+        <tr id='pt16.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestEditBooksOnGdrive - test_watch_metadata</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft16.18')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft16.18" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft16.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_edit_ebooks_gdrive.py&#34;, line 931, in test_watch_metadata
-    self.assertNotIn(&#39;series&#39;, book)
-AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;reader&#39;: [], &#39;title&#39;: &#39;testbook&#39;, &#39;author&#39;: [&#39;John Döe&#39;], &#39;rating&#39;: 0, &#39;languages&#39;: [&#39;English&#39;], &#39;identifier&#39;: [], &#39;cover&#39;: &#39;/cover/5/og?c=1651263008&#39;, &#39;tag&#39;: [], &#39;publisher&#39;: [&#39;Randomhäus&#39;], &#39;pubdate&#39;: &#39;Jan 19, 2017&#39;, &#39;comment&#39;: &#39;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.Aenean commodo ligula eget dolor.Aenean massa.Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem.Nulla consequat massa quis enim.Donec pede justo, fringilla vel, aliquet nec, vulputate&#39;, &#39;add_shelf&#39;: [], &#39;del_shelf&#39;: [], &#39;edit_enable&#39;: True, &#39;kindle&#39;: None, &#39;kindlebtn&#39;: None, &#39;download&#39;: [&#39;EPUB (6.7 kB)&#39;], &#39;read&#39;: False, &#39;archived&#39;: False, &#39;series_all&#39;: &#39;Book 1 of test&#39;, &#39;series_index&#39;: &#39;1&#39;, &#39;series&#39;: &#39;test&#39;, &#39;cust_columns&#39;: []}</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3662,8 +3622,8 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     <tr id="su" class="failClass">
         <td>TestThumbnails</td>
         <td class="text-center">8</td>
-        <td class="text-center">6</td>
-        <td class="text-center">1</td>
+        <td class="text-center">5</td>
+        <td class="text-center">2</td>
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
@@ -3700,11 +3660,31 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
     
     
     
-        <tr id='pt43.4' class='hiddenRow bg-success'>
+        <tr id="ft43.4" class="none bg-danger">
             <td>
                 <div class='testcase'>TestThumbnails - test_cover_change_on_upload_new_cover</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_ft43.4')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft43.4" class="popup_window test_output" style="display:block;">
+                    <div class='close_button pull-right'>
+                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
+                                onclick="document.getElementById('div_ft43.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 135, in test_cover_change_on_upload_new_cover
+    self.assertGreaterEqual(diff(BytesIO(updated_cover), BytesIO(original_cover), delete_diff_file=True), 0.05)
+AssertionError: 0.038404302739168276 not greater than or equal to 0.05</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -3753,9 +3733,9 @@ AssertionError: &#39;series&#39; unexpectedly found in {&#39;id&#39;: 5, &#39;re
                     </div>
                     <div class="text-left pull-left">
                         <pre class="text-left">Traceback (most recent call last):
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 310, in test_sideloaded_book
-    self.assertAlmostEqual(diff(BytesIO(list_cover), BytesIO(old_list_cover), delete_diff_file=True), 0.0,
-AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.005138437597261127 difference)</pre>
+  File &#34;/home/ozzie/Development/calibre-web-test/test/test_thumbnails.py&#34;, line 308, in test_sideloaded_book
+    self.assertGreaterEqual(diff(BytesIO(cover), BytesIO(old_cover), delete_diff_file=True), 0.04)
+AssertionError: 0.03724830839072722 not greater than or equal to 0.04</pre>
                     </div>
                     <div class="clearfix"></div>
                 </div>
@@ -3766,12 +3746,12 @@ AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.0051384375972
     
 
 
-    <tr id="su" class="errorClass">
+    <tr id="su" class="skipClass">
         <td>TestUpdater</td>
         <td class="text-center">9</td>
-        <td class="text-center">4</td>
-        <td class="text-center">3</td>
-        <td class="text-center">1</td>
+        <td class="text-center">8</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('c44', 9)">Detail</a>
@@ -3789,33 +3769,11 @@ AssertionError: 0.005138437597261127 != 0.0 within 0.0001 delta (0.0051384375972
     
     
     
-        <tr id="et44.2" class="none bg-info">
+        <tr id='pt44.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et44.2')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et44.2" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et44.2').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 268, in test_check_update_nightly_request_errors
-    self.check_updater(&#39;Could not fetch&#39;, &#34;alert&#34;)
-  File &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 76, in check_updater
-    self.assertTrue(responsetext in self.check_element_on_page((By.ID, &#34;message&#34;)).text)
-AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -3838,60 +3796,20 @@ AttributeError: &#39;bool&#39; object has no attribute &#39;text&#39;</pre>
     
     
     
-        <tr id="ft44.5" class="none bg-danger">
+        <tr id='pt44.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.5')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.5" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.5').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 363, in test_perform_update
-    self.assertTrue(thumbail_cache_path)
-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>
     
     
     
-        <tr id="ft44.6" class="none bg-danger">
+        <tr id='pt44.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.6')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.6" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.6').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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 321, in test_perform_update_stable_errors
-    self.assertTrue(&#39;HTTP Error&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
-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>
     
     
@@ -3931,31 +3849,11 @@ AssertionError: False is not true</pre>
     
     
     
-        <tr id="ft44.9" class="none bg-danger">
+        <tr id='pt44.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_update_write_protect</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_ft44.9')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft44.9" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_ft44.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_updater.py&#34;, line 424, in test_update_write_protect
-    self.assertTrue(&#39;Update failed&#39; in self.check_element_on_page((By.ID, &#34;DialogContent&#34;)).text)
-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>
     
     
@@ -4747,65 +4645,170 @@ AssertionError: False is not true</pre>
     
 
 
-    <tr id="su" class="errorClass">
-        <td>_ErrorHolder</td>
-        <td class="text-center">1</td>
+    <tr id="su" class="passClass">
+        <td>TestCalibreHelper</td>
+        <td class="text-center">16</td>
+        <td class="text-center">16</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
-        <td class="text-center">1</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c50', 1)">Detail</a>
+            <a onclick="showClassDetail('c50', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id="et50.1" class="none bg-info">
+        <tr id='pt50.1' class='hiddenRow bg-success'>
             <td>
-                <div class='testcase'>setUpClass (test_zz_helper)</div>
+                <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
-            <td colspan='6'>
-                <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_et50.1')">ERROR</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_et50.1" class="popup_window test_output" style="display:block;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus="this.blur();"
-                                onclick="document.getElementById('div_et50.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 &#34;/home/ozzie/Development/calibre-web-test/test/test_zz_helper.py&#34;, line 30, in setUpClass
-    from cps import cli_param
-  File &#34;/home/ozzie/Development/calibre-web/cps/__init__.py&#34;, line 29, in &lt;module&gt;
-    from .MyLoginManager import MyLoginManager
-  File &#34;/home/ozzie/Development/calibre-web/cps/MyLoginManager.py&#34;, line 24, in &lt;module&gt;
-    from flask_login import LoginManager
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/__init__.py&#34;, line 16, in &lt;module&gt;
-    from .login_manager import LoginManager
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/login_manager.py&#34;, line 24, in &lt;module&gt;
-    from .utils import (login_url as make_login_url, _create_identifier,
-  File &#34;/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/flask_login/utils.py&#34;, line 13, in &lt;module&gt;
-    from werkzeug.security import safe_str_cmp
-ImportError: cannot import name &#39;safe_str_cmp&#39; from &#39;werkzeug.security&#39; (/home/ozzie/Development/calibre-web-test/venv/lib/python3.8/site-packages/werkzeug/security.py)</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.2' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.4' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.5' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.6' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.7' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.8' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.9' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.10' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.11' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.12' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_high23</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.14' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_random_password</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.15' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_split_authors</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt50.16' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>408</td>
-        <td>392</td>
-        <td>7</td>
-        <td>2</td>
+        <td>423</td>
+        <td>413</td>
+        <td>3</td>
+        <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
     </tr>
@@ -5254,7 +5257,7 @@ ImportError: cannot import name &#39;safe_str_cmp&#39; from &#39;werkzeug.securi
 </div>
 
 <script>
-    drawCircle(392, 7, 2, 7);
+    drawCircle(413, 3, 0, 7);
     showCase(5);
 </script>